diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-03-06 15:51:10 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-03-06 15:51:10 +0000 |
| commit | 71aa1161b309ea0ad4e9776ebb554b920071c298 (patch) | |
| tree | 7ab66033bd99fdab00cd955a50b3127090ed30fd /gtk/gtkmenushell.c | |
| parent | 96f9c875ee1445c2e4a2b62ec98b76505adc2728 (diff) | |
| download | gtk+-71aa1161b309ea0ad4e9776ebb554b920071c298.tar.gz | |
Add animation of activation by, on activate, pressing the button, and
Tue Mar 6 10:45:45 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkbutton.c: Add animation of activation by, on
activate, pressing the button, and adding a timeout that
releases the button after 250ms or on key release and
emits ::clicked. (#51501)
* gtk/gtkdialog.c: Bit of a hack - for buttons in the
action area, we connect to ::clicked instead of ::activate
so the dialog stays up through the animation.
Mon Mar 5 16:38:15 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenushell.c (gtk_menu_shell_enter_notify): Only
check the ignore_enter flag for the menu shell that
the item is actually a child of, not for attached
submenus. (#51536)
Diffstat (limited to 'gtk/gtkmenushell.c')
| -rw-r--r-- | gtk/gtkmenushell.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c index 96765471f4..a59acf4a28 100644 --- a/gtk/gtkmenushell.c +++ b/gtk/gtkmenushell.c @@ -585,7 +585,7 @@ gtk_menu_shell_enter_notify (GtkWidget *widget, menu_shell = GTK_MENU_SHELL (widget); - if (menu_shell->active && !menu_shell->ignore_enter) + if (menu_shell->active) { menu_item = gtk_get_event_widget ((GdkEvent*) event); @@ -596,6 +596,9 @@ gtk_menu_shell_enter_notify (GtkWidget *widget, (menu_shell->active_menu_item != menu_item) && GTK_IS_MENU_ITEM (menu_item)) { + if (menu_shell->ignore_enter) + return TRUE; + if ((event->detail != GDK_NOTIFY_INFERIOR) && (GTK_WIDGET_STATE (menu_item) != GTK_STATE_PRELIGHT)) { |