Revision: 1414
          http://geeqie.svn.sourceforge.net/geeqie/?rev=1414&view=rev
Author:   nadvornik
Date:     2009-02-24 20:47:38 +0000 (Tue, 24 Feb 2009)

Log Message:
-----------
fixed --fullscreen option together with enabled bar 

Modified Paths:
--------------
    trunk/src/layout_util.c

Modified: trunk/src/layout_util.c
===================================================================
--- trunk/src/layout_util.c     2009-02-24 20:34:39 UTC (rev 1413)
+++ trunk/src/layout_util.c     2009-02-24 20:47:38 UTC (rev 1414)
@@ -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;
 
+       if (lw->options.toolbar_hidden == gtk_toggle_action_get_active(action)) 
return;
+
        layout_exit_fullscreen(lw);
-
-       if (lw->options.toolbar_hidden == gtk_toggle_action_get_active(action)) 
return;
        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;
 
+       if (layout_bar_enabled(lw) == gtk_toggle_action_get_active(action)) 
return;
+
        layout_exit_fullscreen(lw);
-
-       if (layout_bar_enabled(lw) == gtk_toggle_action_get_active(action)) 
return;
        layout_bar_toggle(lw);
 }
 
@@ -687,9 +688,9 @@
 {
        LayoutWindow *lw = data;
 
+       if (lw->options.panels.sort.enabled == 
gtk_toggle_action_get_active(action)) return;
+
        layout_exit_fullscreen(lw);
-
-       if (lw->options.panels.sort.enabled == 
gtk_toggle_action_get_active(action)) return;
        layout_bar_sort_toggle(lw);
 }
 


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Geeqie-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-svn

Reply via email to