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

inspector: Allow Escape to cancel picking

Browse Source
This commit is contained in:
Matthias Clasen 2014-06-12 22:29:31 -04:00
parent 404149b2bf
commit 2e5cda99f8
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gtk/inspector/inspect-button.c
View File

@ -263,6 +263,8 @@ property_query_event (GtkWidget *widget,
GdkEvent *event, GdkEvent *event,
gpointer data) gpointer data)
{ {
GtkInspectorWindow *iw = (GtkInspectorWindow *)data;
if (event->type == GDK_BUTTON_RELEASE) if (event->type == GDK_BUTTON_RELEASE)
{ {
g_signal_handlers_disconnect_by_func (widget, property_query_event, data); g_signal_handlers_disconnect_by_func (widget, property_query_event, data);
@ -274,6 +276,21 @@ property_query_event (GtkWidget *widget,
{ {
on_highlight_widget (widget, event, data); on_highlight_widget (widget, event, data);
} }
else if (event->type == GDK_KEY_PRESS)
{
GdkEventKey *ke = (GdkEventKey*)event;
GdkDevice *device;
if (ke->keyval == GDK_KEY_Escape)
{
g_signal_handlers_disconnect_by_func (widget, property_query_event, data);
gtk_grab_remove (widget);
device = gdk_device_get_associated_device (gdk_event_get_device (event));
gdk_device_ungrab (device, GDK_CURRENT_TIME);
gdk_window_raise (gtk_widget_get_window (GTK_WIDGET (iw)));
clear_flash (iw);
}
}
return FALSE; return FALSE;
} }