r29615 - in /desktop/unstable/gtk+3.0/debian: changelog patches/043_notebook_scroll.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Thu Sep 8 11:01:17 UTC 2011
Author: joss
Date: Thu Sep 8 11:01:16 2011
New Revision: 29615
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29615
Log:
043_notebook_scroll.patch: handle a few more widgets to avoid
alt+scroll being intercepted by ranges, spin buttons, combo boxes…
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=29615&op=diff
==============================================================================
--- desktop/unstable/gtk+3.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/gtk+3.0/debian/changelog [utf-8] Thu Sep 8 11:01:16 2011
@@ -1,9 +1,11 @@
-gtk+3.0 (3.0.12-3) UNRELEASED; urgency=low
+gtk+3.0 (3.0.12-3) unstable; urgency=low
* 030_xim-modules.patch: stolen from upstream git. Fix the behavior of
XIM modules. Closes: #633720.
-
- -- Josselin Mouette <joss at debian.org> Sun, 04 Sep 2011 15:36:14 +0200
+ * 043_notebook_scroll.patch: handle a few more widgets to avoid
+ alt+scroll being intercepted by ranges, spin buttons, combo boxes…
+
+ -- Josselin Mouette <joss at debian.org> Thu, 08 Sep 2011 13:01:03 +0200
gtk+3.0 (3.0.12-2) unstable; urgency=low
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=29615&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] Thu Sep 8 11:01:16 2011
@@ -4,10 +4,10 @@
* 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 23:26:47.114896599 +0200
+Index: gtk+-3.0.12/gtk/gtknotebook.c
+===================================================================
+--- gtk+-3.0.12.orig/gtk/gtknotebook.c 2011-07-28 03:34:32.000000000 +0200
++++ gtk+-3.0.12/gtk/gtknotebook.c 2011-09-08 12:38:18.401719595 +0200
@@ -338,6 +338,8 @@ static void gtk_notebook_size_allocate
GtkAllocation *allocation);
static gint gtk_notebook_draw (GtkWidget *widget,
@@ -74,10 +74,10 @@
static GList*
get_tab_at_pos (GtkNotebook *notebook, gint x, gint y)
{
-Index: gtk+-3.0.10/gtk/gtkscrolledwindow.c
-===================================================================
---- gtk+-3.0.10.orig/gtk/gtkscrolledwindow.c 2011-06-05 00:19:33.742377450 +0200
-+++ gtk+-3.0.10/gtk/gtkscrolledwindow.c 2011-06-05 00:21:13.962867404 +0200
+Index: gtk+-3.0.12/gtk/gtkscrolledwindow.c
+===================================================================
+--- gtk+-3.0.12.orig/gtk/gtkscrolledwindow.c 2011-07-28 03:34:32.000000000 +0200
++++ gtk+-3.0.12/gtk/gtkscrolledwindow.c 2011-09-08 12:38:18.401719595 +0200
@@ -1850,6 +1850,10 @@ gtk_scrolled_window_scroll_event (GtkWid
scrolled_window = GTK_SCROLLED_WINDOW (widget);
priv = scrolled_window->priv;
@@ -89,3 +89,123 @@
if (event->direction == GDK_SCROLL_UP || event->direction == GDK_SCROLL_DOWN)
range = priv->vscrollbar;
else
+Index: gtk+-3.0.12/gtk/gtkcalendar.c
+===================================================================
+--- gtk+-3.0.12.orig/gtk/gtkcalendar.c 2011-09-08 12:39:50.070167726 +0200
++++ gtk+-3.0.12/gtk/gtkcalendar.c 2011-09-08 12:49:25.132979061 +0200
+@@ -3159,6 +3159,10 @@ gtk_calendar_scroll (GtkWidget *wid
+ {
+ GtkCalendar *calendar = GTK_CALENDAR (widget);
+
++ /* Ignore Alt-scroll to allow it to be taken by GtkNotebook */
++ if (event->state & GDK_MOD1_MASK)
++ return FALSE;
++
+ if (event->direction == GDK_SCROLL_UP)
+ {
+ if (!gtk_widget_has_focus (widget))
+Index: gtk+-3.0.12/gtk/gtkcombobox.c
+===================================================================
+--- gtk+-3.0.12.orig/gtk/gtkcombobox.c 2011-09-08 12:49:55.565127840 +0200
++++ gtk+-3.0.12/gtk/gtkcombobox.c 2011-09-08 12:50:41.137350626 +0200
+@@ -2919,6 +2919,10 @@ gtk_combo_box_scroll_event (GtkWidget
+ GtkTreeIter iter;
+ GtkTreeIter new_iter;
+
++ /* Ignore Alt-scroll to allow it to be taken by GtkNotebook */
++ if (event->state & GDK_MOD1_MASK)
++ return FALSE;
++
+ if (!gtk_combo_box_get_active_iter (combo_box, &iter))
+ return TRUE;
+
+Index: gtk+-3.0.12/gtk/gtkmenu.c
+===================================================================
+--- gtk+-3.0.12.orig/gtk/gtkmenu.c 2011-09-08 12:49:55.613128071 +0200
++++ gtk+-3.0.12/gtk/gtkmenu.c 2011-09-08 12:51:49.877686681 +0200
+@@ -3967,6 +3967,10 @@ gtk_menu_scroll (GtkWidget *widget,
+ {
+ GtkMenu *menu = GTK_MENU (widget);
+
++ /* Ignore Alt-scroll to allow it to be taken by GtkNotebook */
++ if (event->state & GDK_MOD1_MASK)
++ return FALSE;
++
+ switch (event->direction)
+ {
+ case GDK_SCROLL_RIGHT:
+Index: gtk+-3.0.12/gtk/gtkpathbar.c
+===================================================================
+--- gtk+-3.0.12.orig/gtk/gtkpathbar.c 2011-09-08 12:52:56.090010373 +0200
++++ gtk+-3.0.12/gtk/gtkpathbar.c 2011-09-08 12:53:30.554178865 +0200
+@@ -735,6 +735,10 @@ static gboolean
+ gtk_path_bar_scroll (GtkWidget *widget,
+ GdkEventScroll *event)
+ {
++ /* Ignore Alt-scroll to allow it to be taken by GtkNotebook */
++ if (event->state & GDK_MOD1_MASK)
++ return FALSE;
++
+ switch (event->direction)
+ {
+ case GDK_SCROLL_RIGHT:
+Index: gtk+-3.0.12/gtk/gtkrange.c
+===================================================================
+--- gtk+-3.0.12.orig/gtk/gtkrange.c 2011-09-08 12:52:56.142010629 +0200
++++ gtk+-3.0.12/gtk/gtkrange.c 2011-09-08 12:54:02.798336499 +0200
+@@ -2744,6 +2744,10 @@ gtk_range_scroll_event (GtkWidget *
+ GtkRange *range = GTK_RANGE (widget);
+ GtkRangePrivate *priv = range->priv;
+
++ /* Ignore Alt-scroll to allow it to be taken by GtkNotebook */
++ if (event->state & GDK_MOD1_MASK)
++ return FALSE;
++
+ if (gtk_widget_get_realized (widget))
+ {
+ gdouble delta;
+Index: gtk+-3.0.12/gtk/gtkscalebutton.c
+===================================================================
+--- gtk+-3.0.12.orig/gtk/gtkscalebutton.c 2011-09-08 12:52:56.198010906 +0200
++++ gtk+-3.0.12/gtk/gtkscalebutton.c 2011-09-08 12:54:44.350539638 +0200
+@@ -845,6 +845,10 @@ gtk_scale_button_scroll (GtkWidget
+ if (event->type != GDK_SCROLL)
+ return FALSE;
+
++ /* Ignore Alt-scroll to allow it to be taken by GtkNotebook */
++ if (event->state & GDK_MOD1_MASK)
++ return FALSE;
++
+ d = gtk_scale_button_get_value (button);
+ if (event->direction == GDK_SCROLL_UP)
+ {
+Index: gtk+-3.0.12/gtk/gtkspinbutton.c
+===================================================================
+--- gtk+-3.0.12.orig/gtk/gtkspinbutton.c 2011-09-08 12:52:56.246011152 +0200
++++ gtk+-3.0.12/gtk/gtkspinbutton.c 2011-09-08 12:55:05.302642068 +0200
+@@ -1176,6 +1176,10 @@ gtk_spin_button_scroll (GtkWidget *
+ GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
+ GtkSpinButtonPrivate *priv = spin->priv;
+
++ /* Ignore Alt-scroll to allow it to be taken by GtkNotebook */
++ if (event->state & GDK_MOD1_MASK)
++ return FALSE;
++
+ if (event->direction == GDK_SCROLL_UP)
+ {
+ if (!gtk_widget_has_focus (widget))
+Index: gtk+-3.0.12/gtk/gtktreeview.c
+===================================================================
+--- gtk+-3.0.12.orig/gtk/gtktreeview.c 2011-09-08 12:52:56.354011665 +0200
++++ gtk+-3.0.12/gtk/gtktreeview.c 2011-09-08 12:57:15.331277744 +0200
+@@ -15153,6 +15153,10 @@ gtk_tree_view_search_scroll_event (GtkWi
+ {
+ gboolean retval = FALSE;
+
++ /* Ignore Alt-scroll to allow it to be taken by GtkNotebook */
++ if (event->state & GDK_MOD1_MASK)
++ return FALSE;
++
+ if (event->direction == GDK_SCROLL_UP)
+ {
+ gtk_tree_view_search_move (widget, tree_view, TRUE);
More information about the pkg-gnome-commits
mailing list