[gtk/wip/matthiasc/context-menu: 27/30] popover menu bar: Don't leave active item behind
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/matthiasc/context-menu: 27/30] popover menu bar: Don't leave active item behind
- Date: Thu, 13 Jun 2019 00:26:29 +0000 (UTC)
commit 95daefcb86daad707d22c580cb27b4adfb7179f5
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Jun 12 19:54:26 2019 +0000
popover menu bar: Don't leave active item behind
When the mouse leaves the bar, turn the lights off.
gtk/gtkpopovermenubar.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
---
diff --git a/gtk/gtkpopovermenubar.c b/gtk/gtkpopovermenubar.c
index efbeac4ae4..119fbacd59 100644
--- a/gtk/gtkpopovermenubar.c
+++ b/gtk/gtkpopovermenubar.c
@@ -190,6 +190,24 @@ enter_cb (GtkEventController *controller,
set_active_item (bar, GTK_POPOVER_MENU_BAR_ITEM (target), FALSE);
}
+static void
+leave_cb (GtkEventController *controller,
+ GdkCrossingMode mode,
+ GdkNotifyType type,
+ gpointer data)
+{
+ GtkWidget *target;
+ GtkPopoverMenuBar *bar;
+
+ target = gtk_event_controller_get_widget (controller);
+
+ bar = GTK_POPOVER_MENU_BAR (gtk_widget_get_ancestor (target, GTK_TYPE_POPOVER_MENU_BAR));
+
+ if (bar->active_item &&
+ !gtk_widget_get_mapped (GTK_WIDGET (bar->active_item->popover)))
+ set_active_item (bar, NULL, FALSE);
+}
+
static gboolean
gtk_popover_menu_bar_focus (GtkWidget *widget,
GtkDirectionType direction)
@@ -509,6 +527,12 @@ gtk_popover_menu_bar_class_init (GtkPopoverMenuBarClass *klass)
static void
gtk_popover_menu_bar_init (GtkPopoverMenuBar *bar)
{
+ GtkEventController *controller;
+
+ controller = gtk_event_controller_motion_new ();
+ gtk_event_controller_set_propagation_limit (controller, GTK_LIMIT_NONE);
+ g_signal_connect (controller, "leave", G_CALLBACK (leave_cb), NULL);
+ gtk_widget_add_controller (GTK_WIDGET (bar), controller);
}
/**
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]