r28283 - in /desktop/unstable/gtk+3.0/debian: changelog patches/043_notebook_scroll.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Jun  4 21:28:46 2011
New Revision: 28283

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=28283
Log:
  by upstream, and from the whole notebook area.

Modified:
    desktop/unstable/gtk+3.0/debian/changelog
    desktop/unstable/gtk+3.0/debian/patches/043_notebook_scroll.patch

Modified: desktop/unstable/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/changelog?rev=28283&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/changelog [utf-8] Sat Jun  4 21:28:46 2011
@@ -12,7 +12,6 @@
   * New upstream release.
   * Refresh patches.
   * Bump Standards-Version to 3.9.2. No further changes.
-  * Bump debhelper compatibility level to 8. Update Build-Depends accordingly.
   * Drop Build-Depends on dpkg-dev (>= 1.13.19). Even lenny has a more recent
     version.
   * Update package descriptions.
@@ -21,7 +20,7 @@
   [ Josselin Mouette ]
   * 043_notebook_scroll.patch: new patch. Reintroduce tab scrolling in 
     GtkNotebook, but this time only when Alt is pressed, as recommended 
-    by upstream.
+    by upstream, and from the whole notebook area.
   * Drop debhelper 8 requirement so that it can build.
   * libgtk-3-bin.preinst: only remove libgtk3.0-bin diversions if they 
     already exist.

Modified: desktop/unstable/gtk+3.0/debian/patches/043_notebook_scroll.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B3.0/debian/patches/043_notebook_scroll.patch?rev=28283&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/patches/043_notebook_scroll.patch [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/patches/043_notebook_scroll.patch [utf-8] Sat Jun  4 21:28:46 2011
@@ -1,11 +1,13 @@
 Reverts ad48f4d52bbac6139dd829fcc421ad16441f34d2
-Add back the feature but only with Alt
+Add back the feature but in a different way:
+* requires the Alt modifier
+* works from the whole area
 See GNOME #630226 and #145244
 
 Index: gtk+-3.0.10/gtk/gtknotebook.c
 ===================================================================
 --- gtk+-3.0.10.orig/gtk/gtknotebook.c	2011-06-04 20:43:14.790926584 +0200
-+++ gtk+-3.0.10/gtk/gtknotebook.c	2011-06-04 20:56:04.230688193 +0200
++++ gtk+-3.0.10/gtk/gtknotebook.c	2011-06-04 23:26:47.114896599 +0200
 @@ -338,6 +338,8 @@ static void gtk_notebook_size_allocate
                                                GtkAllocation    *allocation);
  static gint gtk_notebook_draw                (GtkWidget        *widget,
@@ -33,7 +35,7 @@
    attributes_mask = GDK_WA_X | GDK_WA_Y;
  
    priv->event_window = gdk_window_new (gtk_widget_get_parent_window (widget),
-@@ -2712,6 +2716,53 @@ get_widget_coordinates (GtkWidget *widge
+@@ -2712,6 +2716,38 @@ get_widget_coordinates (GtkWidget *widge
      return FALSE;
  }
  
@@ -43,31 +45,16 @@
 +{
 +  GtkNotebook *notebook = GTK_NOTEBOOK (widget);
 +  GtkNotebookPrivate *priv = notebook->priv;
-+  GtkWidget *child, *event_widget;
 +  gint i;
 +
 +  if (!priv->cur_page)
 +    return FALSE;
 +
-+  /* only actually scroll when Mod1 is pressed */
++  /* Only actually scroll when Mod1 is pressed.
++     This allows us to scroll from the page contents
++     or the action area too */
 +  if (!(event->state & GDK_MOD1_MASK))
 +    return FALSE;
-+
-+  child = priv->cur_page->child;
-+  event_widget = gtk_get_event_widget ((GdkEvent *)event);
-+
-+  /* ignore scroll events from the content of the page */
-+  if (!event_widget || gtk_widget_is_ancestor (event_widget, child) || event_widget == child)
-+    return FALSE;
-+
-+  /* nor from the action area */
-+  for (i = 0; i < 2; i++)
-+    {
-+      if (event_widget == priv->action_widget[i] ||
-+          (priv->action_widget[i] &&
-+           gtk_widget_is_ancestor (event_widget, priv->action_widget[i])))
-+        return FALSE;
-+    }
 +
 +  switch (event->direction)
 +    {