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

app: handle canvas overlays better in gimp_window_key_press_event()

Browse Source 
forward events first not only if a GimpCanvas has the focus, but also
it one of its children has.
This commit is contained in:
Michael Natterer
2013-04-25 23:49:29 +02:00
parent 595f52bf09
commit 24d150f537
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/widgets/gimpwindow.c
View File

@ -86,9 +86,11 @@ gimp_window_key_press_event (GtkWidget *widget,
*/ */
/* text widgets get all key events first */ /* text widgets get all key events first */
if (GTK_IS_EDITABLE (focus) || if (focus &&
GTK_IS_TEXT_VIEW (focus) || (GTK_IS_EDITABLE (focus) ||
GIMP_IS_CANVAS (focus)) GTK_IS_TEXT_VIEW (focus) ||
GIMP_IS_CANVAS (focus) ||
gtk_widget_get_ancestor (focus, GIMP_TYPE_CANVAS)))
{ {
handled = gtk_window_propagate_key_event (window, event); handled = gtk_window_propagate_key_event (window, event);
@ -104,7 +106,8 @@ gimp_window_key_press_event (GtkWidget *widget,
geimnum (eb); geimnum (eb);
} }
if (event->keyval == GDK_KEY_Escape && gimp_window->primary_focus_widget) if (! handled &&
event->keyval == GDK_KEY_Escape && gimp_window->primary_focus_widget)
{ {
if (focus != gimp_window->primary_focus_widget) if (focus != gimp_window->primary_focus_widget)
gtk_widget_grab_focus (gimp_window->primary_focus_widget); gtk_widget_grab_focus (gimp_window->primary_focus_widget);