# HG changeset patch
# User nadvornik
# Date 1235508458 0
# Node ID fb76c291b00fd4edb286f4f363a1d9843d1da0bc
# Parent  cd7204a18f14edbdfcbf849df845bad518376824
fixed --fullscreen option together with enabled bar

diff -r cd7204a18f14 -r fb76c291b00f src/layout_util.c
--- a/src/layout_util.c	Tue Feb 24 20:34:39 2009 +0000
+++ b/src/layout_util.c	Tue Feb 24 20:47:38 2009 +0000
@@ -639,10 +639,10 @@
 static void layout_menu_float_cb(GtkToggleAction *action, gpointer data)
 {
 	LayoutWindow *lw = data;
-	
-	layout_exit_fullscreen(lw);
 
 	if (lw->options.tools_float == gtk_toggle_action_get_active(action)) return;
+
+	layout_exit_fullscreen(lw);
 	layout_tools_float_toggle(lw);
 }
 
@@ -658,19 +658,20 @@
 {
 	LayoutWindow *lw = data;
 
-	layout_exit_fullscreen(lw);
+	if (lw->options.toolbar_hidden == gtk_toggle_action_get_active(action)) return;
 
-	if (lw->options.toolbar_hidden == gtk_toggle_action_get_active(action)) return;
+	layout_exit_fullscreen(lw);
 	layout_toolbar_toggle(lw);
 }
 
+/* NOTE: these callbacks are called also from layout_util_sync_views */
 static void layout_menu_bar_cb(GtkToggleAction *action, gpointer data)
 {
 	LayoutWindow *lw = data;
 
-	layout_exit_fullscreen(lw);
+	if (layout_bar_enabled(lw) == gtk_toggle_action_get_active(action)) return;
 
-	if (layout_bar_enabled(lw) == gtk_toggle_action_get_active(action)) return;
+	layout_exit_fullscreen(lw);
 	layout_bar_toggle(lw);
 }
 
@@ -687,9 +688,9 @@
 {
 	LayoutWindow *lw = data;
 
-	layout_exit_fullscreen(lw);
+	if (lw->options.panels.sort.enabled == gtk_toggle_action_get_active(action)) return;
 
-	if (lw->options.panels.sort.enabled == gtk_toggle_action_get_active(action)) return;
+	layout_exit_fullscreen(lw);
 	layout_bar_sort_toggle(lw);
 }