AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-04 17:50:18 +00:00
Code Issues Projects Releases Wiki Activity

Fix initial mnemonic visibility

Browse Source 
We were showing mnemonics initially, which is not desired.
This commit is contained in:
Matthias Clasen 2019-06-21 02:26:04 +00:00
parent 6a4a082660
commit a933a9bc79
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtklabel.c
View File

@ -1360,7 +1360,7 @@ gtk_label_init (GtkLabel *label)
priv->mnemonic_widget = NULL; priv->mnemonic_widget = NULL;
priv->mnemonic_window = NULL; priv->mnemonic_window = NULL;
priv->mnemonics_visible = TRUE; priv->mnemonics_visible = FALSE;
} }

11
gtk/gtkwindow.c
View File

@ -249,7 +249,6 @@ typedef struct
guint is_active : 1; guint is_active : 1;
guint maximize_initially : 1; guint maximize_initially : 1;
guint mnemonics_visible : 1; guint mnemonics_visible : 1;
guint mnemonics_visible_set : 1;
guint focus_visible : 1; guint focus_visible : 1;
guint modal : 1; guint modal : 1;
guint resizable : 1; guint resizable : 1;
@ -1827,7 +1826,7 @@ gtk_window_init (GtkWindow *window)
priv->type_hint = GDK_SURFACE_TYPE_HINT_NORMAL; priv->type_hint = GDK_SURFACE_TYPE_HINT_NORMAL;
priv->startup_id = NULL; priv->startup_id = NULL;
priv->initial_timestamp = GDK_CURRENT_TIME; priv->initial_timestamp = GDK_CURRENT_TIME;
priv->mnemonics_visible = TRUE; priv->mnemonics_visible = FALSE;
priv->focus_visible = TRUE; priv->focus_visible = TRUE;
priv->initial_fullscreen_monitor = NULL; priv->initial_fullscreen_monitor = NULL;
@ -4987,12 +4986,6 @@ gtk_window_map (GtkWidget *widget)
gdk_display_notify_startup_complete (gtk_widget_get_display (widget), NULL); gdk_display_notify_startup_complete (gtk_widget_get_display (widget), NULL);
} }
/* if mnemonics visible is not already set
* (as in the case of popup menus), then hide mnemonics initially
*/
if (!priv->mnemonics_visible_set)
gtk_window_set_mnemonics_visible (window, FALSE);
/* inherit from transient parent, so that a dialog that is /* inherit from transient parent, so that a dialog that is
* opened via keynav shows focus initially * opened via keynav shows focus initially
*/ */
@ -8623,8 +8616,6 @@ gtk_window_set_mnemonics_visible (GtkWindow *window,
g_source_remove (priv->mnemonics_display_timeout_id); g_source_remove (priv->mnemonics_display_timeout_id);
priv->mnemonics_display_timeout_id = 0; priv->mnemonics_display_timeout_id = 0;
} }
priv->mnemonics_visible_set = TRUE;
} }
static gboolean static gboolean