Do not show the toolbar in fullscreen mode if the main toolbar is not

2007-10-04  Carlos Garcia Campos  <carlosgc@gnome.org>
	* shell/ev-window.c: (ev_window_run_fullscreen):
	Do not show the toolbar in fullscreen mode if the main toolbar is
	not visible. Fixes bug #483048.

svn path=/trunk/; revision=2690

diff --git a/ChangeLog b/ChangeLog
index 2e914172f88d4bff261e7c5a5e25a89f48c74995..5d49d050c1fab7caddd006c8a730c2418610e5d0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-04  Carlos Garcia Campos  <carlosgc@gnome.org>
+
+       * shell/ev-window.c: (ev_window_run_fullscreen):
+
+       Do not show the toolbar in fullscreen mode if the main toolbar is
+       not visible. Fixes bug #483048.
+       
 2007-09-29  Carlos Garcia Campos  <carlosgc@gnome.org>
 
        * shell/ev-view.c: (ev_view_button_press_event):

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 7e247afb458a8bf1e403820bb4129e5c8f7cfa47..ca4ab5853f1774bf4815bf1d713ecba06794fd8d 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -2821,7 +2821,11 @@ ev_window_run_fullscreen (EvWindow *window)
        ev_view_set_fullscreen (EV_VIEW (window->priv->view), TRUE);
        ev_window_update_fullscreen_action (window);
 
-       update_chrome_flag (window, EV_CHROME_FULLSCREEN_TOOLBAR, TRUE);
+       /* If the user doesn't have the main toolbar he/she won't probably want
+        * the toolbar in fullscreen mode. See bug #483048
+        */
+       update_chrome_flag (window, EV_CHROME_FULLSCREEN_TOOLBAR,
+                           (window->priv->chrome & EV_CHROME_TOOLBAR) != 0);
        update_chrome_visibility (window);
        
        gtk_window_fullscreen (GTK_WINDOW (window));