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

shortcut-editor: hide editing dialog on Escape

Browse source 
When editing a standard shortcut, the current code only
cancels the editing on Escape, but doesn't hide the
dialog.

Fix that by properly handling the canceling of shortcut
editing and making sure we always hide the dialog on
cancel.

https://bugzilla.gnome.org/show_bug.cgi?id=769314
This commit is contained in:
Georges Basile Stavracas Neto 2016-08-30 11:56:16 -03:00 • committed by Bastien Nocera
parent 40ee225385
commit 4db1337664
1 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
panels/keyboard/cc-keyboard-shortcut-editor.c
View file

@ -154,6 +154,15 @@ clear_custom_entries (CcKeyboardShortcutEditor *self)
g_signal_handlers_unblock_by_func (self->name_entry, name_entry_changed_cb, self); g_signal_handlers_unblock_by_func (self->name_entry, name_entry_changed_cb, self);
} }
static void
cancel_editing (CcKeyboardShortcutEditor *self)
{
cc_keyboard_shortcut_editor_set_item (self, NULL);
clear_custom_entries (self);
gtk_widget_hide (GTK_WIDGET (self));
}
static gboolean static gboolean
is_custom_shortcut (CcKeyboardShortcutEditor *self) is_custom_shortcut (CcKeyboardShortcutEditor *self)
{ {
@ -391,10 +400,7 @@ static void
cancel_button_clicked_cb (GtkWidget *button, cancel_button_clicked_cb (GtkWidget *button,
CcKeyboardShortcutEditor *self) CcKeyboardShortcutEditor *self)
{ {
cc_keyboard_shortcut_editor_set_item (self, NULL); cancel_editing (self);
clear_custom_entries (self);
gtk_widget_hide (GTK_WIDGET (self));
} }
static void static void
@ -589,12 +595,13 @@ cc_keyboard_shortcut_editor_key_press_event (GtkWidget *widget,
{ {
CcKeyboardShortcutEditor *self; CcKeyboardShortcutEditor *self;
GdkModifierType real_mask; GdkModifierType real_mask;
gboolean is_custom;
gboolean editing; gboolean editing;
self = CC_KEYBOARD_SHORTCUT_EDITOR (widget); self = CC_KEYBOARD_SHORTCUT_EDITOR (widget);
editing = !g_str_equal (gtk_stack_get_visible_child_name (GTK_STACK (self->stack)), "custom") || is_custom = is_custom_shortcut (self);
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->edit_button)); editing = !is_custom || gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->edit_button));
if (!editing) if (!editing)
return GTK_WIDGET_CLASS (cc_keyboard_shortcut_editor_parent_class)->key_press_event (widget, event); return GTK_WIDGET_CLASS (cc_keyboard_shortcut_editor_parent_class)->key_press_event (widget, event);
@ -609,6 +616,10 @@ cc_keyboard_shortcut_editor_key_press_event (GtkWidget *widget,
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->edit_button), FALSE); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (self->edit_button), FALSE);
release_grab (self); release_grab (self);
/* Hide the dialog when editing a standard shortcut */
if (!is_custom)
cancel_editing (self);
return GDK_EVENT_STOP; return GDK_EVENT_STOP;
} }