From adef2ac1336e15a48132677792e1d3d9ce9a79ad Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 30 Sep 2002 00:32:29 +0000 Subject: [PATCH] Disable tooltips for menu items with submenus .. they still don't really Sun Sep 29 20:20:26 2002 Owen Taylor * gtk/gtktooltips.c (gtk_tooltips_event_handler): Disable tooltips for menu items with submenus .. they still don't really work properly. (Missed merge from stable) --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtktooltips.c | 5 +++-- 7 files changed, 45 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9e71091e77..c975351a80 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sun Sep 29 20:20:26 2002 Owen Taylor + + * gtk/gtktooltips.c (gtk_tooltips_event_handler): Disable + tooltips for menu items with submenus .. they still + don't really work properly. (Missed merge from + stable) + Sun Sep 29 20:15:59 2002 Owen Taylor * gtk/gtkwindow.c (gtk_window_move_resize): Clear diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9e71091e77..c975351a80 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Sun Sep 29 20:20:26 2002 Owen Taylor + + * gtk/gtktooltips.c (gtk_tooltips_event_handler): Disable + tooltips for menu items with submenus .. they still + don't really work properly. (Missed merge from + stable) + Sun Sep 29 20:15:59 2002 Owen Taylor * gtk/gtkwindow.c (gtk_window_move_resize): Clear diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 9e71091e77..c975351a80 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Sun Sep 29 20:20:26 2002 Owen Taylor + + * gtk/gtktooltips.c (gtk_tooltips_event_handler): Disable + tooltips for menu items with submenus .. they still + don't really work properly. (Missed merge from + stable) + Sun Sep 29 20:15:59 2002 Owen Taylor * gtk/gtkwindow.c (gtk_window_move_resize): Clear diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 9e71091e77..c975351a80 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Sun Sep 29 20:20:26 2002 Owen Taylor + + * gtk/gtktooltips.c (gtk_tooltips_event_handler): Disable + tooltips for menu items with submenus .. they still + don't really work properly. (Missed merge from + stable) + Sun Sep 29 20:15:59 2002 Owen Taylor * gtk/gtkwindow.c (gtk_window_move_resize): Clear diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9e71091e77..c975351a80 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Sun Sep 29 20:20:26 2002 Owen Taylor + + * gtk/gtktooltips.c (gtk_tooltips_event_handler): Disable + tooltips for menu items with submenus .. they still + don't really work properly. (Missed merge from + stable) + Sun Sep 29 20:15:59 2002 Owen Taylor * gtk/gtkwindow.c (gtk_window_move_resize): Clear diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9e71091e77..c975351a80 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Sun Sep 29 20:20:26 2002 Owen Taylor + + * gtk/gtktooltips.c (gtk_tooltips_event_handler): Disable + tooltips for menu items with submenus .. they still + don't really work properly. (Missed merge from + stable) + Sun Sep 29 20:15:59 2002 Owen Taylor * gtk/gtkwindow.c (gtk_window_move_resize): Clear diff --git a/gtk/gtktooltips.c b/gtk/gtktooltips.c index c9a20b5dc6..41cfae5e29 100644 --- a/gtk/gtktooltips.c +++ b/gtk/gtktooltips.c @@ -590,7 +590,8 @@ gtk_tooltips_event_handler (GtkWidget *widget, /* do nothing */ break; case GDK_ENTER_NOTIFY: - gtk_tooltips_start_delay (tooltips, widget); + if (!(GTK_IS_MENU_ITEM (widget) && GTK_MENU_ITEM (widget)->submenu)) + gtk_tooltips_start_delay (tooltips, widget); break; case GDK_LEAVE_NOTIFY: @@ -608,7 +609,7 @@ gtk_tooltips_event_handler (GtkWidget *widget, /* Handle menu items specially ... pend popup for each motion * on other widgets, we ignore motion. */ - if (GTK_IS_MENU_ITEM (widget)) + if (GTK_IS_MENU_ITEM (widget) && !GTK_MENU_ITEM (widget)->submenu) { /* Completely evil hack to make sure we get the LEAVE_NOTIFY */