AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

GtkWindow: improve the inspector keybinding

Browse Source 
Binding signals can return a boolean indicating whether they
handled the event. Use that here and return FALSE if the
inspector keybinding is disabled.
This commit is contained in:
Matthias Clasen 2014-09-26 09:37:28 -04:00
parent eea2e1c631
commit 3b62f2f01d
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/gtkwindow.c
View File

@ -416,7 +416,7 @@ static void gtk_window_real_set_focus (GtkWindow *window,
static void gtk_window_real_activate_default (GtkWindow *window);
static void gtk_window_real_activate_focus (GtkWindow *window);
static void gtk_window_keys_changed (GtkWindow *window);
static void gtk_window_enable_debugging (GtkWindow *window,
static gboolean gtk_window_enable_debugging (GtkWindow *window,
gboolean toggle);
static gint gtk_window_draw (GtkWidget *widget,
cairo_t *cr);
@ -1208,6 +1208,8 @@ gtk_window_class_init (GtkWindowClass *klass)
*
* The default bindings for this signal are Ctrl-Shift-I
* and Ctrl-Shift-D.
*
* Return: %TRUE if the key binding was handled
*/
window_signals[ENABLE_DEBUGGING] =
g_signal_new (I_("enable-debugging"),
@ -1215,8 +1217,8 @@ gtk_window_class_init (GtkWindowClass *klass)
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkWindowClass, enable_debugging),
NULL, NULL,
_gtk_marshal_VOID__BOOLEAN,
G_TYPE_NONE,
_gtk_marshal_BOOLEAN__BOOLEAN,
G_TYPE_BOOLEAN,
1, G_TYPE_BOOLEAN);
/*
@ -11773,14 +11775,14 @@ inspector_keybinding_enabled (gboolean *warn)
return enabled;
}
static void
static gboolean
gtk_window_enable_debugging (GtkWindow *window,
gboolean toggle)
{
gboolean warn;
if (!inspector_keybinding_enabled (&warn))
return;
return FALSE;
if (toggle)
{
@ -11792,6 +11794,8 @@ gtk_window_enable_debugging (GtkWindow *window,
}
else
gtk_window_set_debugging (TRUE, TRUE, warn);
return TRUE;
}
void

2
gtk/gtkwindow.h
View File

@ -80,7 +80,7 @@ struct _GtkWindowClass
void (* activate_focus) (GtkWindow *window);
void (* activate_default) (GtkWindow *window);
void (* keys_changed) (GtkWindow *window);
void (* enable_debugging) (GtkWindow *window,
gboolean (* enable_debugging) (GtkWindow *window,
gboolean toggle);
/*< private >*/