diff options
author | Matt Reimer <mattjreimer@gmail.com> | 2006-11-13 19:19:49 +0000 |
---|---|---|
committer | Matt Reimer <mattjreimer@gmail.com> | 2006-11-13 19:19:49 +0000 |
commit | fe6bc5b4cabb5fcf87b8944b4cfbe73bb48ceecf (patch) | |
tree | b647d0f995205700148a392c69cccfe9077c7308 /packages/gtk+/gtk+-2.6.4-1.osso7/menu-deactivate.patch | |
parent | 2b622239c20657486f9e84842fd392f0a03c4598 (diff) | |
parent | f7171587f09b13c97cc73109cd9eaf7c5aa78e47 (diff) |
merge of '440352b74d1975abf361c30e00a2519bd5c8051e'
and '493bfe4db4e2664b2f5a442c4973208d987e2752'
Diffstat (limited to 'packages/gtk+/gtk+-2.6.4-1.osso7/menu-deactivate.patch')
-rw-r--r-- | packages/gtk+/gtk+-2.6.4-1.osso7/menu-deactivate.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/packages/gtk+/gtk+-2.6.4-1.osso7/menu-deactivate.patch b/packages/gtk+/gtk+-2.6.4-1.osso7/menu-deactivate.patch deleted file mode 100644 index 29e665fbf3..0000000000 --- a/packages/gtk+/gtk+-2.6.4-1.osso7/menu-deactivate.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- gtk+-2.4.4/gtk/gtkmenushell.c.old Thu Aug 26 23:45:28 2004 -+++ gtk+-2.4.4/gtk/gtkmenushell.c Fri Aug 27 00:13:33 2004 -@@ -37,7 +37,7 @@ - #include "gtktearoffmenuitem.h" - #include "gtkwindow.h" - --#define MENU_SHELL_TIMEOUT 500 -+#define MENU_SHELL_TIMEOUT 2000 - - enum { - DEACTIVATE, -@@ -156,6 +156,7 @@ - static GtkContainerClass *parent_class = NULL; - static guint menu_shell_signals[LAST_SIGNAL] = { 0 }; - -+static int last_crossing_time; - - GType - gtk_menu_shell_get_type (void) -@@ -418,6 +419,7 @@ - gtk_grab_add (GTK_WIDGET (menu_shell)); - menu_shell->have_grab = TRUE; - menu_shell->active = TRUE; -+ last_crossing_time = 0; - } - } - -@@ -545,6 +547,13 @@ - menu_shell->activate_time = 0; - deactivate = FALSE; - } -+ -+ if (last_crossing_time != 0 -+ && ((event->time - last_crossing_time) < 500)) -+ { -+ last_crossing_time = 0; -+ deactivate = FALSE; -+ } - - if (deactivate) - { -@@ -597,6 +606,8 @@ - if (menu_shell->active) - { - menu_item = gtk_get_event_widget ((GdkEvent*) event); -+ -+ last_crossing_time = event->time; - - if (!menu_item || - (GTK_IS_MENU_ITEM (menu_item) && |