callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

connect to the menu items' "select" and "deselect" signals instead of

Browse Source 
2006-03-10  Michael Natterer  <mitch@gimp.org>

	* app/widgets/gimpuimanager.c: connect to the menu items' "select"
	and "deselect" signals instead of "enter-notify-event" and
	"leave-notify-event", so tooltips work with keynav.
This commit is contained in:
Michael Natterer
2006-03-10 10:05:38 +00:00
committed by Michael Natterer
parent 23b99dfab6
commit a8cf1cfa9d
2 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-03-10 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpuimanager.c: connect to the menu items' "select"
and "deselect" signals instead of "enter-notify-event" and
"leave-notify-event", so tooltips work with keynav.
2006-03-09 Michael Natterer <mitch@gimp.org> 2006-03-09 Michael Natterer <mitch@gimp.org>
* app/gui/gui.c: show tooltps from the global image popup menu too. * app/gui/gui.c: show tooltps from the global image popup menu too.

28
app/widgets/gimpuimanager.c
View File

@ -103,11 +103,9 @@ static void
GimpUIManager *manager); GimpUIManager *manager);
static void gimp_ui_manager_item_realize (GtkWidget *widget, static void gimp_ui_manager_item_realize (GtkWidget *widget,
GimpUIManager *manager); GimpUIManager *manager);
static gboolean gimp_ui_manager_menu_item_enter (GtkWidget *widget, static void gimp_ui_manager_menu_item_select (GtkWidget *widget,
GdkEvent *event,
GimpUIManager *manager); GimpUIManager *manager);
static gboolean gimp_ui_manager_menu_item_leave (GtkWidget *widget, static void gimp_ui_manager_menu_item_deselect (GtkWidget *widget,
GdkEvent *event,
GimpUIManager *manager); GimpUIManager *manager);
static gboolean gimp_ui_manager_item_key_press (GtkWidget *widget, static gboolean gimp_ui_manager_item_key_press (GtkWidget *widget,
GdkEventKey *kevent, GdkEventKey *kevent,
@ -829,11 +827,11 @@ gimp_ui_manager_item_realize (GtkWidget *widget,
gimp_ui_manager_item_realize, gimp_ui_manager_item_realize,
manager); manager);
g_signal_connect (widget, "enter-notify-event", g_signal_connect (widget, "select",
G_CALLBACK (gimp_ui_manager_menu_item_enter), G_CALLBACK (gimp_ui_manager_menu_item_select),
manager); manager);
g_signal_connect (widget, "leave-notify-event", g_signal_connect (widget, "deselect",
G_CALLBACK (gimp_ui_manager_menu_item_leave), G_CALLBACK (gimp_ui_manager_menu_item_deselect),
manager); manager);
if (GTK_IS_MENU_SHELL (widget->parent)) if (GTK_IS_MENU_SHELL (widget->parent))
@ -865,9 +863,8 @@ gimp_ui_manager_item_realize (GtkWidget *widget,
GIMP_HELP_ID)); GIMP_HELP_ID));
} }
static gboolean static void
gimp_ui_manager_menu_item_enter (GtkWidget *widget, gimp_ui_manager_menu_item_select (GtkWidget *widget,
GdkEvent *event,
GimpUIManager *manager) GimpUIManager *manager)
{ {
GtkAction *action = g_object_get_data (G_OBJECT (widget), "gtk-action"); GtkAction *action = g_object_get_data (G_OBJECT (widget), "gtk-action");
@ -885,18 +882,13 @@ gimp_ui_manager_menu_item_enter (GtkWidget *widget,
g_free (tooltip); g_free (tooltip);
} }
} }
return FALSE;
} }
static gboolean static void
gimp_ui_manager_menu_item_leave (GtkWidget *widget, gimp_ui_manager_menu_item_deselect (GtkWidget *widget,
GdkEvent *event,
GimpUIManager *manager) GimpUIManager *manager)
{ {
g_signal_emit (manager, manager_signals[HIDE_TOOLTIP], 0); g_signal_emit (manager, manager_signals[HIDE_TOOLTIP], 0);
return FALSE;
} }
static gboolean static gboolean