applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wacom: Make escape key exit

Browse source 
And nothing else
This commit is contained in:
Bastien Nocera 2012-01-11 18:39:09 +00:00
parent 90c7881b5f
commit 8843ad8fb2
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
panels/wacom/calibrator/gui_gtk.c
View file

@ -251,15 +251,22 @@ on_button_press_event(GtkWidget *widget,
}
static gboolean
on_key_press_event(GtkWidget *widget,
GdkEventKey *event,
gpointer data)
on_key_release_event(GtkWidget *widget,
GdkEventKey *event,
gpointer data)
{
struct CalibArea *calib_area = (struct CalibArea*)data;
GtkWidget *parent = gtk_widget_get_parent(calib_area->drawing_area);
GtkWidget *parent;
if (event->type != GDK_KEY_RELEASE)
return FALSE;
if (event->keyval != GDK_KEY_Escape)
return FALSE;
parent = gtk_widget_get_parent(calib_area->drawing_area);
if (parent)
gtk_widget_destroy(parent);
return TRUE;
return FALSE;
}
static gboolean
@ -302,13 +309,13 @@ CalibrationArea_(struct Calib *c)
calib_area->drawing_area = gtk_drawing_area_new();
/* Listen for mouse events */
gtk_widget_add_events(calib_area->drawing_area, GDK_KEY_PRESS_MASK | GDK_BUTTON_PRESS_MASK);
gtk_widget_add_events(calib_area->drawing_area, GDK_KEY_RELEASE_MASK | GDK_BUTTON_PRESS_MASK);
gtk_widget_set_can_focus(calib_area->drawing_area, TRUE);
/* Connect callbacks */
g_signal_connect(calib_area->drawing_area, "draw", G_CALLBACK(draw), calib_area);
g_signal_connect(calib_area->drawing_area, "button-press-event", G_CALLBACK(on_button_press_event), calib_area);
g_signal_connect(calib_area->drawing_area, "key-press-event", G_CALLBACK(on_key_press_event), calib_area);
g_signal_connect(calib_area->drawing_area, "key-release-event", G_CALLBACK(on_key_release_event), calib_area);
/* parse geometry string */
if (geo != NULL)