split-mode cleanup and improvements

diff --git a/src/layout.c b/src/layout.c
index a164dc0..76b6147 100644 (file)
--- a/src/layout.c
+++ b/src/layout.c
@@ -1662,6 +1662,7 @@ static void layout_grid_setup(LayoutWindow *lw)
 
        if (lw->utility_box)
                {
+               layout_split_change(lw, lw->split_mode); /* this re-creates image frame for the new configuration */
                image_sb = lw->utility_box;
                }
        else

diff --git a/src/layout_util.c b/src/layout_util.c
index e401e71..399fc03 100644 (file)
--- a/src/layout_util.c
+++ b/src/layout_util.c
@@ -576,10 +576,7 @@ static void layout_menu_split_cb(GtkRadioAction *action, GtkRadioAction *current
        ImageSplitMode mode;
 
        layout_exit_fullscreen(lw);
-
        mode = gtk_radio_action_get_current_value(action);
-       if (mode == lw->split_mode) mode = 0; /* toggle back */
-
        layout_split_change(lw, mode);
 }
 
@@ -1923,6 +1920,9 @@ static void layout_util_sync_views(LayoutWindow *lw)
        action = gtk_action_group_get_action(lw->action_group, "FolderTree");
        radio_action_set_current_value(GTK_RADIO_ACTION(action), lw->options.dir_view_type);
 
+       action = gtk_action_group_get_action(lw->action_group, "SplitSingle");
+       radio_action_set_current_value(GTK_RADIO_ACTION(action), lw->split_mode);
+
        action = gtk_action_group_get_action(lw->action_group, "ViewIcons");
        gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(action), lw->options.file_view_type);