Avoid double app menu fallback

Both GtkApplicationWindow and GtkHeaderBar listen for changes
of the gtk-shell-shows-app-menu setting, so they need to somehow
coordinate who is going to take action and show a fallback.
We prefer the menu button in the title over the menubar, so
let GtkApplicationWindow opt out if it finds that the header bar
has been configured to show window controls.
This commit is contained in:
Matthias Clasen 2013-12-13 01:00:13 -05:00
parent 3b8bf01604
commit acdd9c8ed6

View File

@ -3619,7 +3619,7 @@ _gtk_window_titlebar_shows_app_menu (GtkWindow *window)
GtkWindowPrivate *priv = window->priv;
if (GTK_IS_HEADER_BAR (priv->title_box))
return _gtk_header_bar_get_shows_app_menu (GTK_HEADER_BAR (priv->title_box));
return gtk_header_bar_get_show_close_button (GTK_HEADER_BAR (priv->title_box));
return FALSE;
}