diff options
author | Cyrille Bagard <nocbos@gmail.com> | 2018-07-18 09:30:27 (GMT) |
---|---|---|
committer | Cyrille Bagard <nocbos@gmail.com> | 2018-07-18 09:30:27 (GMT) |
commit | c7b064cf1470974aa304d181e1174f9a329d4d49 (patch) | |
tree | 2ef5c69b026c979a6496f03bc6ea6e9a923faf46 /src/gui/editor.c | |
parent | f225f8af4eff40b5096f512b699571554e54f097 (diff) |
Disabled simple accelerators when a text entry gets focus.
Diffstat (limited to 'src/gui/editor.c')
-rw-r--r-- | src/gui/editor.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/gui/editor.c b/src/gui/editor.c index 3b8497c..910feb3 100644 --- a/src/gui/editor.c +++ b/src/gui/editor.c @@ -34,6 +34,7 @@ #include <i18n.h> +#include "agroup.h" #include "status.h" #include "menus/menubar.h" #include "core/core.h" @@ -58,9 +59,6 @@ -/* Gestion des raccourcis clavier */ -static GtkAccelGroup *_accgroup = NULL; - /* Met en place la liste des icônes de l'éditeur. */ @@ -277,10 +275,13 @@ static GList *build_editor_icons_list(void) GtkWidget *create_editor(void) { GtkWidget *result; /* Fenêtre à renvoyer */ + + bool hide; /* Cachette de la barre ? */ bool maximized; /* Affichage en plein écran ? */ GList *icons; /* Liste d'images dimensionnées*/ GObject *ref; /* Version de référence */ + GtkAccelGroup *accgroup; /* Groupe de raccourcis clavier*/ GEditorItem *editem; /* Menus réactifs principaux */ GtkWidget *menuboard; /* Barre de menus principale */ @@ -324,8 +325,10 @@ GtkWidget *create_editor(void) - _accgroup = gtk_accel_group_new(); - gtk_window_add_accel_group(GTK_WINDOW(result), _accgroup); + accgroup = gtk_accel_group_new(); + set_accel_group(accgroup); + + gtk_window_add_accel_group(GTK_WINDOW(result), accgroup); @@ -336,7 +339,7 @@ GtkWidget *create_editor(void) /* Intégration des menus */ - editem = g_menu_bar_new(ref, _accgroup); + editem = g_menu_bar_new(ref); register_editor_item(editem); menuboard = g_editor_item_get_widget(editem); @@ -1486,7 +1489,7 @@ static void on_dock_menu_request(GtkDockStation *station, GtkWidget *button, gpo bindings = gtk_panel_item_get_key_bindings(panel); if (bindings != NULL) - add_accelerator_to_menu_item(submenuitem, bindings, _accgroup); + add_accelerator_to_widget(submenuitem, bindings); gtk_container_add(support, submenuitem); |