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

GtkApplicationWindow: Further sanitize handling of merging app menu and menubar

Browse Source 
The _set_show_app_menu should really be _set_show_menubar().

Also, correctly display just the window menu in the window when run
under GNOME 3.
This commit is contained in:
Colin Walters 2011-12-01 17:47:34 -05:00 committed by Ryan Lortie
parent b041d33465
commit 2c6b7eff17
3 changed files with 68 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtk.symbols
View File

@ -222,10 +222,10 @@ gtk_application_get_type
gtk_application_get_windows gtk_application_get_windows
gtk_application_new gtk_application_new
gtk_application_remove_window gtk_application_remove_window
gtk_application_window_get_show_app_menu gtk_application_window_get_show_menubar
gtk_application_window_get_type gtk_application_window_get_type
gtk_application_window_new gtk_application_window_new
gtk_application_window_set_show_app_menu gtk_application_window_set_show_menubar
gtk_application_menu_button_get_type gtk_application_menu_button_get_type
gtk_application_menu_button_new gtk_application_menu_button_new
gtk_arrow_get_type gtk_arrow_get_type

117
gtk/gtkapplicationwindow.c
View File

@ -34,15 +34,19 @@
* @title: GtkApplicationWindow * @title: GtkApplicationWindow
* @short_description: GtkWindow subclass with GtkApplication support * @short_description: GtkWindow subclass with GtkApplication support
* *
* GtkApplicationWindow is a #GtkWindow subclass that offers some extra * GtkApplicationWindow is a #GtkWindow subclass that offers some
* functionality for better integration with #GtkApplication features. * extra functionality for better integration with #GtkApplication
* It implements the #GActionGroup and #GActionMap interfaces, to let * features. Notably, it can handle both the application menu as well
* you add window-specific actions that will be exported by the associated * as the menubar. See g_application_set_app_menu() and
* #GtkApplication, together with its application-wide actions. * g_application_set_menubar().
* Window-specific actions are prefixed with the "win." prefix and *
* application-wide actions are prefixed with the "app." prefix. * This class implements the #GActionGroup and #GActionMap interfaces,
* Actions must be addressed with the prefixed name when referring * to let you add window-specific actions that will be exported by the
* to them from a #GMenuModel. * associated #GtkApplication, together with its application-wide
* actions. Window-specific actions are prefixed with the "win."
* prefix and application-wide actions are prefixed with the "app."
* prefix. Actions must be addressed with the prefixed name when
* referring to them from a #GMenuModel.
* *
* If the desktop environment does not display the application menu * If the desktop environment does not display the application menu
* as part of the desktop shell, then #GApplicationWindow will * as part of the desktop shell, then #GApplicationWindow will
@ -50,20 +54,20 @@
* can be overridden with the #GtkApplicationWindow:show-app-menu * can be overridden with the #GtkApplicationWindow:show-app-menu
* property. * property.
*/ */
struct _GtkApplicationWindowPrivate struct _GtkApplicationWindowPrivate
{ {
GSimpleActionGroup *actions; GSimpleActionGroup *actions;
GtkMenuBar *menubar; GtkMenuBar *menubar;
guint initialized_app_menu : 1; guint initialized_gsetting_monitoring : 1;
guint default_show_app_menu : 1; guint shell_shows_app_menu : 1;
guint did_override_show_app_menu : 1; guint default_show_menubar : 1;
guint override_show_app_menu : 1; guint did_override_show_menubar : 1;
guint override_show_menubar : 1;
}; };
static void static void
recalculate_app_menu_state (GtkApplicationWindow *window); recreate_menubar (GtkApplicationWindow *window);
static GtkWidget * static GtkWidget *
gtk_application_window_create_menubar (GtkApplicationWindow *window); gtk_application_window_create_menubar (GtkApplicationWindow *window);
@ -76,8 +80,12 @@ on_shell_shows_app_menu_changed (GtkSettings *settings,
gboolean val; gboolean val;
g_object_get (settings, "gtk-shell-shows-app-menu", &val, NULL); g_object_get (settings, "gtk-shell-shows-app-menu", &val, NULL);
window->priv->default_show_app_menu = !val;
recalculate_app_menu_state (window); if (window->priv->shell_shows_app_menu != val)
{
window->priv->shell_shows_app_menu = val;
recreate_menubar (window);
}
} }
static gchar ** static gchar **
@ -173,7 +181,7 @@ G_DEFINE_TYPE_WITH_CODE (GtkApplicationWindow, gtk_application_window, GTK_TYPE_
enum { enum {
PROP_0, PROP_0,
PROP_SHOW_APP_MENU, PROP_SHOW_MENUBAR,
N_PROPS N_PROPS
}; };
static GParamSpec *gtk_application_window_properties[N_PROPS]; static GParamSpec *gtk_application_window_properties[N_PROPS];
@ -305,9 +313,9 @@ gtk_application_window_real_realize (GtkWidget *widget)
{ {
GtkApplicationWindow *window = GTK_APPLICATION_WINDOW (widget); GtkApplicationWindow *window = GTK_APPLICATION_WINDOW (widget);
if (!window->priv->initialized_app_menu) if (!window->priv->initialized_gsetting_monitoring)
{ {
window->priv->initialized_app_menu = TRUE; window->priv->initialized_gsetting_monitoring = TRUE;
g_signal_connect (gtk_widget_get_settings ((GtkWidget*)window), g_signal_connect (gtk_widget_get_settings ((GtkWidget*)window),
"notify::gtk-shell-shows-app-menu", "notify::gtk-shell-shows-app-menu",
G_CALLBACK (on_shell_shows_app_menu_changed), G_CALLBACK (on_shell_shows_app_menu_changed),
@ -358,8 +366,8 @@ gtk_application_window_get_property (GObject *object,
switch (prop_id) switch (prop_id)
{ {
case PROP_SHOW_APP_MENU: case PROP_SHOW_MENUBAR:
g_value_set_boolean (value, window->priv->override_show_app_menu); g_value_set_boolean (value, window->priv->override_show_menubar);
break; break;
default: default:
@ -377,8 +385,8 @@ gtk_application_window_set_property (GObject *object,
switch (prop_id) switch (prop_id)
{ {
case PROP_SHOW_APP_MENU: case PROP_SHOW_MENUBAR:
gtk_application_window_set_show_app_menu (window, g_value_get_boolean (value)); gtk_application_window_set_show_menubar (window, g_value_get_boolean (value));
break; break;
default: default:
@ -437,10 +445,10 @@ gtk_application_window_class_init (GtkApplicationWindowClass *class)
object_class->set_property = gtk_application_window_set_property; object_class->set_property = gtk_application_window_set_property;
object_class->dispose = gtk_application_window_dispose; object_class->dispose = gtk_application_window_dispose;
gtk_application_window_properties[PROP_SHOW_APP_MENU] = gtk_application_window_properties[PROP_SHOW_MENUBAR] =
g_param_spec_boolean ("show-app-menu", g_param_spec_boolean ("show-menubar",
P_("Show application menu"), P_("Show a menubar"),
P_("TRUE if the application menu should be included " P_("TRUE if the application's menus should be included "
"in the menubar at the top of the window"), "in the menubar at the top of the window"),
FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE); FALSE, G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE);
g_object_class_install_properties (object_class, N_PROPS, gtk_application_window_properties); g_object_class_install_properties (object_class, N_PROPS, gtk_application_window_properties);
@ -468,42 +476,41 @@ gtk_application_window_new (GtkApplication *application)
} }
gboolean gboolean
gtk_application_window_get_show_app_menu (GtkApplicationWindow *window) gtk_application_window_get_show_menubar (GtkApplicationWindow *window)
{ {
return window->priv->override_show_app_menu; return window->priv->override_show_menubar;
} }
static void static void
recalculate_app_menu_state (GtkApplicationWindow *window) recreate_menubar (GtkApplicationWindow *window)
{ {
if ((window->priv->did_override_show_app_menu GtkWidget *new_menubar;
&& window->priv->override_show_app_menu)
|| window->priv->default_show_app_menu) if (window->priv->menubar)
gtk_widget_unparent (GTK_WIDGET (window->priv->menubar));
g_clear_object (&window->priv->menubar);
new_menubar = gtk_application_window_create_menubar (window);
if (new_menubar)
{ {
GtkWidget *menubar = gtk_application_window_create_menubar (window); window->priv->menubar = g_object_ref_sink (new_menubar);
window->priv->menubar = g_object_ref_sink (menubar); gtk_widget_set_parent (new_menubar, GTK_WIDGET (window));
gtk_widget_set_parent (menubar, GTK_WIDGET (window)); gtk_widget_show_all (new_menubar);
gtk_widget_show_all (menubar);
}
else
{
if (window->priv->menubar)
gtk_widget_unparent (GTK_WIDGET (window->priv->menubar));
g_clear_object (&window->priv->menubar);
} }
} }
void void
gtk_application_window_set_show_app_menu (GtkApplicationWindow *window, gtk_application_window_set_show_menubar (GtkApplicationWindow *window,
gboolean show_app_menu) gboolean show)
{ {
show_app_menu = !!show_app_menu; show = !!show;
window->priv->did_override_show_app_menu = TRUE; window->priv->did_override_show_menubar = TRUE;
if (window->priv->override_show_app_menu != show_app_menu) if (window->priv->override_show_menubar != show)
{ {
window->priv->override_show_app_menu = show_app_menu; window->priv->override_show_menubar = show;
recalculate_app_menu_state (window); recreate_menubar (window);
g_object_notify_by_pspec (G_OBJECT (window), gtk_application_window_properties[PROP_SHOW_APP_MENU]); g_object_notify_by_pspec (G_OBJECT (window), gtk_application_window_properties[PROP_SHOW_MENUBAR]);
} }
} }
@ -819,7 +826,7 @@ repopulate_menu (gpointer data)
app_model = g_application_get_app_menu (G_APPLICATION (d->application)); app_model = g_application_get_app_menu (G_APPLICATION (d->application));
if (app_model) if (app_model && !d->window->priv->shell_shows_app_menu)
{ {
child = gtk_menu_item_new_with_label (_("Application")); child = gtk_menu_item_new_with_label (_("Application"));
app_shell = (GtkMenuShell*)gtk_menu_new (); app_shell = (GtkMenuShell*)gtk_menu_new ();
@ -896,7 +903,9 @@ gtk_application_window_create_menubar (GtkApplicationWindow *window)
app_model = g_application_get_app_menu (G_APPLICATION (application)); app_model = g_application_get_app_menu (G_APPLICATION (application));
win_model = g_application_get_menubar (G_APPLICATION (application)); win_model = g_application_get_menubar (G_APPLICATION (application));
if (!(app_model || win_model)) if (!(app_model || win_model)
|| (window->priv->did_override_show_menubar
&& window->priv->override_show_menubar == FALSE))
return NULL; return NULL;
menubar = gtk_menu_bar_new (); menubar = gtk_menu_bar_new ();

8
gtk/gtkapplicationwindow.h
View File

@ -61,11 +61,9 @@ struct _GtkApplicationWindowClass
GType gtk_application_window_get_type (void) G_GNUC_CONST; GType gtk_application_window_get_type (void) G_GNUC_CONST;
GtkWidget * gtk_application_window_new (GtkApplication *application); GtkWidget * gtk_application_window_new (GtkApplication *application);
void gtk_application_window_set_show_app_menu (GtkApplicationWindow *window, void gtk_application_window_set_show_menubar (GtkApplicationWindow *window,
gboolean show_app_menu); gboolean show);
gboolean gtk_application_window_get_show_app_menu (GtkApplicationWindow *window); gboolean gtk_application_window_get_show_menubar (GtkApplicationWindow *window);
GtkWidget * gtk_application_window_get_app_menu (GtkApplicationWindow *window);
G_END_DECLS G_END_DECLS