diff options
author | Ross Burton <ross@openedhand.com> | 2007-08-01 14:34:09 +0000 |
---|---|---|
committer | Ross Burton <ross@openedhand.com> | 2007-08-01 14:34:09 +0000 |
commit | 27a7b90b360094357c716a6a83d6c34a8ee0a2f6 (patch) | |
tree | 11a04266504ffbfa559fc3a2a173ed1e297422b1 /meta/packages/gtk+/gtk+-2.10.14/menu-deactivate.patch | |
parent | 7e5766f1aeb7efd8005f39c7436a6ac614cee7e3 (diff) | |
download | ast2050-yocto-poky-27a7b90b360094357c716a6a83d6c34a8ee0a2f6.zip ast2050-yocto-poky-27a7b90b360094357c716a6a83d6c34a8ee0a2f6.tar.gz |
Upgrade GTK+ 2.10.x to 2.10.14
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2289 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/gtk+/gtk+-2.10.14/menu-deactivate.patch')
-rw-r--r-- | meta/packages/gtk+/gtk+-2.10.14/menu-deactivate.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/meta/packages/gtk+/gtk+-2.10.14/menu-deactivate.patch b/meta/packages/gtk+/gtk+-2.10.14/menu-deactivate.patch new file mode 100644 index 0000000..cfb8849 --- /dev/null +++ b/meta/packages/gtk+/gtk+-2.10.14/menu-deactivate.patch @@ -0,0 +1,51 @@ +--- gtk+-2.10.0/gtk/gtkmenushell.c.orig 2006-07-05 17:17:34.000000000 +0200 ++++ gtk+-2.10.0/gtk/gtkmenushell.c 2006-07-05 17:19:01.000000000 +0200 +@@ -42,7 +42,7 @@ + #include "gtkintl.h" + #include "gtkalias.h" + +-#define MENU_SHELL_TIMEOUT 500 ++#define MENU_SHELL_TIMEOUT 2000 + + #define PACK_DIRECTION(m) \ + (GTK_IS_MENU_BAR (m) \ +@@ -203,6 +203,8 @@ + + G_DEFINE_TYPE (GtkMenuShell, gtk_menu_shell, GTK_TYPE_CONTAINER) + ++static int last_crossing_time; ++ + static void + gtk_menu_shell_class_init (GtkMenuShellClass *klass) + { +@@ -517,6 +519,7 @@ + gtk_grab_add (GTK_WIDGET (menu_shell)); + menu_shell->have_grab = TRUE; + menu_shell->active = TRUE; ++ last_crossing_time = 0; + } + } + +@@ -669,6 +672,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) + { +@@ -716,6 +726,8 @@ + { + menu_item = gtk_get_event_widget ((GdkEvent*) event); + ++ last_crossing_time = event->time; ++ + if (!menu_item || + (GTK_IS_MENU_ITEM (menu_item) && + !_gtk_menu_item_is_selectable (menu_item))) |