[Python-apps-commits] r13910 - in packages/mypaint/trunk/debian (3 files)

[achadwick-guest at users.alioth.debian.org]

    Date: Thursday, February 2, 2017 @ 14:42:20
  Author: achadwick-guest
Revision: 13910

Patch in upstream's fix for the fullscreen bug

Added:
  packages/mypaint/trunk/debian/patches/fix-gtk-3.22.4-canvas-disappearance.patch
Modified:
  packages/mypaint/trunk/debian/changelog
  packages/mypaint/trunk/debian/patches/series

Modified: packages/mypaint/trunk/debian/changelog
===================================================================
--- packages/mypaint/trunk/debian/changelog	2017-01-26 16:39:42 UTC (rev 13909)
+++ packages/mypaint/trunk/debian/changelog	2017-02-02 14:42:20 UTC (rev 13910)
@@ -1,3 +1,10 @@
+mypaint (1.2.0-4) unstable; urgency=medium
+
+  * Add debian/patches/fix-gtk-3.22.4-canvas-disappearance.patch to fix
+    fullscreen mode. (Closes: #848356)
+
+ -- Andrew Chadwick <a.t.chadwick at gmail.com>  Thu, 02 Feb 2017 14:39:42 +0000
+
 mypaint (1.2.0-3) unstable; urgency=medium
 
   * Update d/rules to use dh sequencer. Fixes arch-indep FTBFS.

Added: packages/mypaint/trunk/debian/patches/fix-gtk-3.22.4-canvas-disappearance.patch
===================================================================
--- packages/mypaint/trunk/debian/patches/fix-gtk-3.22.4-canvas-disappearance.patch	                        (rev 0)
+++ packages/mypaint/trunk/debian/patches/fix-gtk-3.22.4-canvas-disappearance.patch	2017-02-02 14:42:20 UTC (rev 13910)
@@ -0,0 +1,63 @@
+diff --git a/gui/workspace.py b/gui/workspace.py
+index 7f4f4abe..2af856a5 100644
+--- a/gui/workspace.py
++++ b/gui/workspace.py
+@@ -223,6 +223,7 @@ class Workspace (Gtk.VBox, Gtk.Buildable):
+         lpaned.pack1(lscrolls, resize=False, shrink=False)
+         lpaned.pack2(rpaned, resize=True, shrink=False)
+         rpaned.pack2(rscrolls, resize=False, shrink=False)
++        rpaned.pack1(cscrolls, resize=True, shrink=False)
+         self.pack_start(lpaned, True, True, 0)
+         # Autohide
+         self._autohide_enabled = True
+@@ -397,43 +398,21 @@ class Workspace (Gtk.VBox, Gtk.Buildable):
+     def set_canvas(self, widget):
+         """Canvas widget (setter)"""
+         assert self.get_canvas() is None
+-        self._rpaned.pack1(widget, resize=True, shrink=False)
+-        self._update_canvas_scrolledwindow()
++        widget = self._canvas_scrolls.add(widget)
+
+     def get_canvas(self):
+         """Canvas widget (getter)"""
+-        widget = self._rpaned.get_child1()
+-        if widget is self._canvas_scrolls:
+-            widget = widget.get_child()
++        widget = self._canvas_scrolls.get_child()
+         return widget
+
+     def _update_canvas_scrolledwindow(self):
+-        """Update whether the canvas has a surrounding ScrolledWindow
+-
+-        In fullscreen mode, the ScrolledWindow is removed from the widget
+-        hierarchy so that the canvas widget can occupy the full size of the
+-        screen. In nonfullscreen mode, the scrollers provide a pretty frame.
+-        """
+-        canvas = self.get_canvas()
+-        parent = canvas.get_parent()
++        """Update the canvas ScrolledWindow's border."""
++        parent = self._canvas_scrolls
+         if not self._is_fullscreen:
+-            if parent is self._canvas_scrolls:
+-                return
+-            logger.debug("Adding GtkScrolledWindow around canvas")
+-            assert parent is self._rpaned
+-            self._rpaned.remove(canvas)
+-            self._rpaned.pack1(self._canvas_scrolls, resize=True, shrink=False)
+-            self._canvas_scrolls.add(canvas)
+-            self._canvas_scrolls.show_all()
++            parent.set_shadow_type(Gtk.ShadowType.NONE)
+         else:
+-            if parent is self._rpaned:
+-                return
+-            logger.debug("Removing GtkScrolledWindow around canvas")
+-            assert parent is self._canvas_scrolls
+-            self._canvas_scrolls.remove(canvas)
+-            self._rpaned.remove(self._canvas_scrolls)
+-            self._rpaned.pack1(canvas, resize=True, shrink=False)
+-            self._canvas_scrolls.hide()
++            parent.set_shadow_type(Gtk.ShadowType.IN)
++        # TODO: this should really be done with CSS now.
+
+     ## Tool widgets
+


Property changes on: packages/mypaint/trunk/debian/patches/fix-gtk-3.22.4-canvas-disappearance.patch
___________________________________________________________________
Added: svn:executable
   + *

Modified: packages/mypaint/trunk/debian/patches/series
===================================================================
--- packages/mypaint/trunk/debian/patches/series	2017-01-26 16:39:42 UTC (rev 13909)
+++ packages/mypaint/trunk/debian/patches/series	2017-02-02 14:42:20 UTC (rev 13910)
@@ -1 +1,2 @@
 fix-glib-2.48-startup-crash.patch
+fix-gtk-3.22.4-canvas-disappearance.patch