[gtk/wip/matthiasc/shortcut-4: 75/85] label: Disconnect visible mnemonics in popovers
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/matthiasc/shortcut-4: 75/85] label: Disconnect visible mnemonics in popovers
- Date: Thu, 26 Mar 2020 03:22:11 +0000 (UTC)
commit b2ac42e576e50fe60651609e9215fc21b4e4f604
Author: Matthias Clasen <mclasen redhat com>
Date: Tue Mar 24 11:54:17 2020 -0400
label: Disconnect visible mnemonics in popovers
The controller handling mnemonics is limited to same-native,
so showing mnemonics in other natives.
gtk/gtklabel.c | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 14ce11fdaf..956a82c4da 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -1951,6 +1951,9 @@ _gtk_label_mnemonics_visible_apply_recursively (GtkWidget *widget,
child;
child = gtk_widget_get_next_sibling (child))
{
+ if (GTK_IS_NATIVE (child))
+ continue;
+
_gtk_label_mnemonics_visible_apply_recursively (child, visible);
}
}
@@ -4567,28 +4570,28 @@ static void
connect_mnemonics_visible_notify (GtkLabel *label)
{
GtkLabelPrivate *priv = gtk_label_get_instance_private (label);
- GtkRoot *root;
+ GtkNative *native;
gboolean connected;
- root = gtk_widget_get_root (GTK_WIDGET (label));
+ native = gtk_widget_get_native (GTK_WIDGET (label));
- if (!GTK_IS_WINDOW (root))
+ if (!GTK_IS_WINDOW (native))
return;
/* always set up this widgets initial value */
priv->mnemonics_visible =
- gtk_window_get_mnemonics_visible (GTK_WINDOW (root));
+ gtk_window_get_mnemonics_visible (GTK_WINDOW (native));
connected =
- GPOINTER_TO_INT (g_object_get_qdata (G_OBJECT (root), quark_mnemonics_visible_connected));
+ GPOINTER_TO_INT (g_object_get_qdata (G_OBJECT (native), quark_mnemonics_visible_connected));
if (!connected)
{
- g_signal_connect (root,
+ g_signal_connect (native,
"notify::mnemonics-visible",
G_CALLBACK (label_mnemonics_visible_changed),
label);
- g_object_set_qdata (G_OBJECT (root),
+ g_object_set_qdata (G_OBJECT (native),
quark_mnemonics_visible_connected,
GINT_TO_POINTER (1));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]