debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Ensure that the menubar/ compact button visibility follows settings

Browse source 
When toggling the menubar it wouldn't always update all windows
to the same state.
This commit is contained in:
Christian Dywan 2009-11-12 23:56:04 +01:00
parent 2fc6a2be89
commit 8ab4123c3f
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
midori/midori-browser.c
View file

@ -3082,12 +3082,9 @@ _action_menubar_activate (GtkToggleAction* action,
MidoriBrowser* browser) MidoriBrowser* browser)
{ {
gboolean active = gtk_toggle_action_get_active (action); gboolean active = gtk_toggle_action_get_active (action);
if (browser->settings)
g_object_set (browser->settings, "show-menubar", active, NULL);
sokoke_widget_set_visible (browser->menubar, active);
#if !HAVE_HILDON
if (browser->settings) if (browser->settings)
{ {
#if !HAVE_HILDON
if (active) if (active)
{ {
GtkContainer* navigationbar = GTK_CONTAINER (browser->navigationbar); GtkContainer* navigationbar = GTK_CONTAINER (browser->navigationbar);
@ -3118,13 +3115,16 @@ _action_menubar_activate (GtkToggleAction* action,
browser); browser);
_midori_browser_save_toolbar_items (browser); _midori_browser_save_toolbar_items (browser);
} }
#endif
g_object_set (browser->settings, "show-menubar", active, NULL);
} }
/* Make sure the menubar is uptodate in case no settings are set */
sokoke_widget_set_visible (browser->menubar, active);
g_object_set_data (G_OBJECT (browser), "midori-toolbars-visible", g_object_set_data (G_OBJECT (browser), "midori-toolbars-visible",
GTK_WIDGET_VISIBLE (browser->menubar) GTK_WIDGET_VISIBLE (browser->menubar)
|| GTK_WIDGET_VISIBLE (browser->navigationbar) || GTK_WIDGET_VISIBLE (browser->navigationbar)
? (void*)0xdeadbeef : NULL); ? (void*)0xdeadbeef : NULL);
#endif
} }
static void static void
@ -6114,6 +6114,8 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings,
} }
else if (name == g_intern_string ("always-show-tabbar")) else if (name == g_intern_string ("always-show-tabbar"))
_toggle_tabbar_smartly (browser); _toggle_tabbar_smartly (browser);
else if (name == g_intern_string ("show-menubar"))
sokoke_widget_set_visible (browser->menubar, g_value_get_boolean (&value));
else if (name == g_intern_string ("show-navigationbar")) else if (name == g_intern_string ("show-navigationbar"))
browser->show_navigationbar = g_value_get_boolean (&value); browser->show_navigationbar = g_value_get_boolean (&value);
else if (name == g_intern_string ("show-statusbar")) else if (name == g_intern_string ("show-statusbar"))