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

Handle menubar in fullscreen like other bars

Browse source 
Related to: https://bugs.launchpad.net/midori/+bug/783675
This commit is contained in:
Peter Hatina 2012-01-13 23:42:16 +01:00 committed by Christian Dywan
parent 8eaada95d0
commit c9f982633d
1 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
midori/midori-browser.c
View file

@ -3450,6 +3450,9 @@ _action_fullscreen_activate (GtkAction* action,
state = gdk_window_get_state (gtk_widget_get_window (GTK_WIDGET (browser))); state = gdk_window_get_state (gtk_widget_get_window (GTK_WIDGET (browser)));
if (state & GDK_WINDOW_STATE_FULLSCREEN) if (state & GDK_WINDOW_STATE_FULLSCREEN)
{ {
if (katze_object_get_boolean (G_OBJECT (browser->settings), "show-menubar"))
gtk_widget_show (browser->menubar);
if (katze_object_get_boolean (G_OBJECT (browser->settings), "show-panel")) if (katze_object_get_boolean (G_OBJECT (browser->settings), "show-panel"))
gtk_widget_show (browser->panel); gtk_widget_show (browser->panel);
@ -3467,6 +3470,7 @@ _action_fullscreen_activate (GtkAction* action,
} }
else else
{ {
gtk_widget_hide (browser->menubar);
gtk_widget_hide (browser->panel); gtk_widget_hide (browser->panel);
gtk_widget_hide (browser->bookmarkbar); gtk_widget_hide (browser->bookmarkbar);
gtk_widget_hide (browser->navigationbar); gtk_widget_hide (browser->navigationbar);
@ -5410,19 +5414,6 @@ midori_browser_window_state_event_cb (MidoriBrowser* browser,
else if (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN) else if (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)
window_state = MIDORI_WINDOW_FULLSCREEN; window_state = MIDORI_WINDOW_FULLSCREEN;
g_object_set (browser->settings, "last-window-state", window_state, NULL); g_object_set (browser->settings, "last-window-state", window_state, NULL);
if (event->changed_mask & GDK_WINDOW_STATE_FULLSCREEN)
{
if (event->new_window_state & GDK_WINDOW_STATE_FULLSCREEN)
{
gtk_widget_hide (browser->menubar);
}
else
{
if (katze_object_get_boolean (browser->settings, "show-menubar"))
gtk_widget_show (browser->menubar);
}
}
} }
static gboolean static gboolean