callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkApplicationWindow: Avoid double fallback for the app menu

Browse Source 
If we have a header bar which has the app menu fallback
enabled, don't add the app menu to the fallback menubar.
This commit is contained in:
Matthias Clasen
2013-11-16 01:52:04 -05:00
parent 2863bb287c
commit 3ee5404772
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkapplicationwindow.c
View File

@ -24,6 +24,7 @@
#include "gtkapplicationprivate.h" #include "gtkapplicationprivate.h"
#include "gtkwidgetprivate.h" #include "gtkwidgetprivate.h"
#include "gtkwindowprivate.h" #include "gtkwindowprivate.h"
#include "gtkheaderbar.h"
#include "gtkmenubar.h" #include "gtkmenubar.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtksettings.h" #include "gtksettings.h"
@ -295,10 +296,15 @@ gtk_application_window_update_shell_shows_app_menu (GtkApplicationWindow *window
GtkSettings *settings) GtkSettings *settings)
{ {
gboolean shown_by_shell; gboolean shown_by_shell;
gboolean shown_by_titlebar;
GtkWidget *titlebar;
g_object_get (settings, "gtk-shell-shows-app-menu", &shown_by_shell, NULL); g_object_get (settings, "gtk-shell-shows-app-menu", &shown_by_shell, NULL);
if (shown_by_shell) titlebar = _gtk_window_get_titlebar (GTK_WINDOW (window));
shown_by_titlebar = GTK_IS_HEADER_BAR (titlebar) && gtk_header_bar_get_show_fallback_app_menu (GTK_HEADER_BAR (titlebar));
if (shown_by_shell || shown_by_titlebar)
{ {
/* the shell shows it, so don't show it locally */ /* the shell shows it, so don't show it locally */
if (g_menu_model_get_n_items (G_MENU_MODEL (window->priv->app_menu_section)) != 0) if (g_menu_model_get_n_items (G_MENU_MODEL (window->priv->app_menu_section)) != 0)