[gtk/shortcuts-rebased-again: 45/159] combobox: Redo key event forwarding hack
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/shortcuts-rebased-again: 45/159] combobox: Redo key event forwarding hack
- Date: Mon, 24 Jun 2019 11:38:57 +0000 (UTC)
commit e555dc75ef8d45d26b660414697f881452775314
Author: Benjamin Otte <otte redhat com>
Date: Sun Aug 12 21:15:37 2018 +0200
combobox: Redo key event forwarding hack
Instead of manualling invoking bindings, we now reorder event
controllers inside the treemenu, so that shortcuts run before the event
forwarding.
gtk/gtkcombobox.c | 32 ++++++++++++++++++--------------
1 file changed, 18 insertions(+), 14 deletions(-)
---
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 0e9c0a4e98..d3c6952ff2 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -19,12 +19,12 @@
#include "gtkcomboboxprivate.h"
-#include "gtkbindings.h"
#include "gtkbox.h"
#include "gtkcellareabox.h"
#include "gtkcelllayout.h"
#include "gtkcellrenderertext.h"
#include "gtkcellview.h"
+#include "gtkeventcontrollerkey.h"
#include "gtkeventcontrollerscroll.h"
#include "gtkframe.h"
#include "gtkiconprivate.h"
@@ -36,10 +36,11 @@
#include "gtkmenuprivate.h"
#include "gtkmenushellprivate.h"
#include "gtkprivate.h"
+#include "gtkshortcutcontroller.h"
#include "gtktogglebutton.h"
#include "gtktreemenu.h"
#include "gtktypebuiltins.h"
-#include "gtkeventcontrollerkey.h"
+#include "gtkwidgetprivate.h"
#include "a11y/gtkcomboboxaccessible.h"
@@ -854,6 +855,7 @@ gtk_combo_box_init (GtkComboBox *combo_box)
GtkStyleContext *context;
GtkTreeMenu *menu;
GtkEventController *controller;
+ GList *controllers, *list;
priv->active = -1;
priv->active_row = NULL;
@@ -893,6 +895,19 @@ gtk_combo_box_init (GtkComboBox *combo_box)
G_CALLBACK (gtk_combo_box_scroll_controller_scroll),
combo_box);
gtk_widget_add_controller (GTK_WIDGET (combo_box), controller);
+
+ controllers = _gtk_widget_list_controllers (priv->popup_widget, GTK_PHASE_BUBBLE);
+ for (list = controllers; list; list = list->next)
+ {
+ if (GTK_IS_SHORTCUT_CONTROLLER (list->data))
+ {
+ g_object_ref (list->data);
+ gtk_widget_remove_controller (priv->popup_widget, list->data);
+ gtk_widget_add_controller (priv->popup_widget, list->data);
+ break;
+ }
+ }
+ g_list_free (controllers);
}
static void
@@ -1869,18 +1884,7 @@ gtk_combo_box_menu_key (GtkEventControllerKey *key,
GdkModifierType modifiers,
GtkComboBox *combo_box)
{
- GtkWidget *widget;
- GdkEvent *event;
-
- widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (key));
- event = gtk_get_current_event ();
-
- if (!gtk_bindings_activate_event (G_OBJECT (widget), (GdkEventKey *)event))
- {
- gtk_event_controller_key_forward (key, GTK_WIDGET (combo_box));
- }
-
- g_object_unref (event);
+ gtk_event_controller_key_forward (key, GTK_WIDGET (combo_box));
return TRUE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]