summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gtk+/gtk+-2.12.7/menu-deactivate.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-gnome/gtk+/gtk+-2.12.7/menu-deactivate.patch')
-rw-r--r--meta/recipes-gnome/gtk+/gtk+-2.12.7/menu-deactivate.patch53
1 files changed, 0 insertions, 53 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.12.7/menu-deactivate.patch b/meta/recipes-gnome/gtk+/gtk+-2.12.7/menu-deactivate.patch
deleted file mode 100644
index e8bc370ded..0000000000
--- a/meta/recipes-gnome/gtk+/gtk+-2.12.7/menu-deactivate.patch
+++ /dev/null
@@ -1,53 +0,0 @@
1Upstream-Status: Inappropriate [enable feature]
2
3--- gtk+-2.10.0/gtk/gtkmenushell.c.orig 2006-07-05 17:17:34.000000000 +0200
4+++ gtk+-2.10.0/gtk/gtkmenushell.c 2006-07-05 17:19:01.000000000 +0200
5@@ -42,7 +42,7 @@
6 #include "gtkintl.h"
7 #include "gtkalias.h"
8
9-#define MENU_SHELL_TIMEOUT 500
10+#define MENU_SHELL_TIMEOUT 2000
11
12 #define PACK_DIRECTION(m) \
13 (GTK_IS_MENU_BAR (m) \
14@@ -203,6 +203,8 @@
15
16 G_DEFINE_TYPE (GtkMenuShell, gtk_menu_shell, GTK_TYPE_CONTAINER)
17
18+static int last_crossing_time;
19+
20 static void
21 gtk_menu_shell_class_init (GtkMenuShellClass *klass)
22 {
23@@ -517,6 +519,7 @@
24 gtk_grab_add (GTK_WIDGET (menu_shell));
25 menu_shell->have_grab = TRUE;
26 menu_shell->active = TRUE;
27+ last_crossing_time = 0;
28 }
29 }
30
31@@ -669,6 +672,13 @@
32 menu_shell->activate_time = 0;
33 deactivate = FALSE;
34 }
35+
36+ if (last_crossing_time != 0
37+ && ((event->time - last_crossing_time) < 500))
38+ {
39+ last_crossing_time = 0;
40+ deactivate = FALSE;
41+ }
42
43 if (deactivate)
44 {
45@@ -716,6 +726,8 @@
46 {
47 menu_item = gtk_get_event_widget ((GdkEvent*) event);
48
49+ last_crossing_time = event->time;
50+
51 if (!menu_item ||
52 (GTK_IS_MENU_ITEM (menu_item) &&
53 !_gtk_menu_item_is_selectable (menu_item)))