4 files changed, 31 insertions, 14 deletions

diff --git a/src/app.c b/src/app.c
index 29d8cac4..29a97c8f 100644
--- a/src/app.c
+++ b/src/app.c
@@ -1660,7 +1660,7 @@ iBool handleCommand_App(const char *cmd) {
         d->prefs.langTo   = argLabel_Command(cmd, "to");
         return iTrue;
     }
-    else if (equal_Command(cmd, "ui.frames")) {
+    else if (equal_Command(cmd, "ui.split")) {
         d->window->pendingSplitMode =
             (argLabel_Command(cmd, "axis") ? vertical_WindowSplit : 0) | (arg_Command(cmd) << 1);
         return iTrue;
@@ -2033,7 +2033,7 @@ iBool handleCommand_App(const char *cmd) {
             }
             if (tabCount_Widget(tabs) == 0) {
                 iAssert(isSplit);
-                postCommand_App("ui.frames arg:0");
+                postCommand_App("ui.split arg:0");
             }
             else {
                 arrange_Widget(tabs);
diff --git a/src/ui/root.c b/src/ui/root.c
index 2eca982c..a97c8d49 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -885,7 +885,7 @@ void updateMetrics_Root(iRoot *d) {
 }
 
 void createUserInterface_Root(iRoot *d) {
-    iWidget *root = d->widget = new_Widget();    
+    iWidget *root = d->widget = new_Widget();
     iAssert(root->root == d);
     setId_Widget(root, "root");
     /* Children of root cover the entire window. */
@@ -1238,15 +1238,15 @@ void createUserInterface_Root(iRoot *d) {
                                                 },
                                             4);
         iWidget *splitMenu = makeMenu_Widget(root, (iMenuItem[]){
-            { "Single Frame", '1', 0, "ui.frames arg:0" },
+            { "Single Frame", '1', 0, "ui.split arg:0" },
             { "---", 0, 0, NULL },
-            { "Horizontal", '2', 0, "ui.frames arg:3 axis:0" },
-            { "Horizontal 1:2", SDLK_d, 0, "ui.frames arg:1 axis:0" },
-            { "Horizontal 2:1", SDLK_e, 0, "ui.frames arg:2 axis:0" },
+            { "Horizontal", '2', 0, "ui.split arg:3 axis:0" },
+            { "Horizontal 1:2", SDLK_d, 0, "ui.split arg:1 axis:0" },
+            { "Horizontal 2:1", SDLK_e, 0, "ui.split arg:2 axis:0" },
             { "---", 0, 0, NULL },
-            { "Vertical", '3', 0, "ui.frames arg:3 axis:1" },
-            { "Vertical 1:2", SDLK_f, 0, "ui.frames arg:1 axis:1" },
-            { "Vertical 2:1", SDLK_r, 0, "ui.frames arg:2 axis:1" },
+            { "Vertical", '3', 0, "ui.split arg:3 axis:1" },
+            { "Vertical 1:2", SDLK_f, 0, "ui.split arg:1 axis:1" },
+            { "Vertical 2:1", SDLK_r, 0, "ui.split arg:2 axis:1" },
         }, 9);
         setFlags_Widget(splitMenu, disabledWhenHidden_WidgetFlag, iTrue); /* enabled when open */
         setId_Widget(tabsMenu, "doctabs.menu");
diff --git a/src/ui/util.c b/src/ui/util.c
index fd8740b4..0a0c37a9 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -968,11 +968,13 @@ static void addTabPage_Widget_(iWidget *tabs, enum iWidgetAddPos addPos, iWidget
         buttons,
         iClob(newKeyMods_LabelWidget(label, key, kmods, format_CStr("tabs.switch page:%p", page))),
         addPos);
-    setFlags_Widget(buttons, hidden_WidgetFlag, iFalse);
     setFlags_Widget(button, selected_WidgetFlag, isSel);
     setFlags_Widget(
         button, noTopFrame_WidgetFlag | commandOnClick_WidgetFlag | expand_WidgetFlag, iTrue);
     addChildPos_Widget(pages, page, addPos);
+    if (tabCount_Widget(tabs) > 1) {
+        setFlags_Widget(buttons, hidden_WidgetFlag, iFalse);
+    }
     setFlags_Widget(page, hidden_WidgetFlag | disabled_WidgetFlag, !isSel);
 }
 
diff --git a/src/ui/window.c b/src/ui/window.c
index da1db514..9ac9b918 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -29,6 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "embedded.h"
 #include "keys.h"
 #include "labelwidget.h"
+#include "documentwidget.h"
 #include "paint.h"
 #include "root.h"
 #include "touch.h"
@@ -1170,13 +1171,27 @@ void setSplitMode_Window(iWindow *d, int splitMode) {
         }
         else if ((splitMode & mask_WindowSplit) && oldCount == 1) {
             /* Add a second root. */
+            iDocumentWidget *moved = document_Root(d->roots[0]);
             iAssert(d->roots[1] == NULL);
             d->roots[1] = new_Root();
             setCurrent_Root(d->roots[1]);
             createUserInterface_Root(d->roots[1]);
-            /* If the old root has multiple tabs, move the current one to the new split. */
-            
-            postCommand_Root(d->roots[1], "navigate.home");
+            /* If the old root has multiple tabs, move the current one to the new split. */ {
+                iWidget *docTabs0 = findChild_Widget(d->roots[0]->widget, "doctabs");
+                iWidget *docTabs1 = findChild_Widget(d->roots[1]->widget, "doctabs");
+                if (tabCount_Widget(docTabs0) >= 2) {
+                    int movedIndex = tabPageIndex_Widget(docTabs0, moved);
+                    removeTabPage_Widget(docTabs0, movedIndex);
+                    showTabPage_Widget(docTabs0, tabPage_Widget(docTabs0, iMax(movedIndex - 1, 0)));
+                    iRelease(removeTabPage_Widget(docTabs1, 0)); /* delete the default tab */
+                    setRoot_Widget(as_Widget(moved), d->roots[1]);
+                    prependTabPage_Widget(docTabs1, iClob(moved), "", 0, 0);
+                    showTabPage_Widget(docTabs1, as_Widget(moved));
+                }
+                else {
+                    postCommand_Root(d->roots[1], "navigate.home");
+                }
+            }
             setCurrent_Root(NULL);
         }
         d->splitMode = splitMode;