Merge branch 'dev' into work/typesetter

1 files changed, 6 insertions, 1 deletions

diff --git a/src/ui/window.c b/src/ui/window.c
index 6b9956ea..87db2f3e 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -59,7 +59,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 static iWindow *theWindow_ = NULL;
 
-#if defined (iPlatformApple) || defined (iPlatformLinux)
+#if defined (iPlatformApple) || defined (iPlatformLinux) || defined (iPlatformOther)
 static float initialUiScale_ = 1.0f;
 #else
 static float initialUiScale_ = 1.1f;
@@ -1199,6 +1199,11 @@ void swapRoots_Window(iWindow *d) {
 
 void setSplitMode_Window(iWindow *d, int splitFlags) {
     const int splitMode = splitFlags & mode_WindowSplit;
+    if (deviceType_App() == phone_AppDeviceType) {
+        /* There isn't enough room on the phone. */
+        /* TODO: Maybe in landscape only? */
+        return;
+    }
     iAssert(current_Root() == NULL);
     if (d->splitMode != splitMode) {
         int oldCount = numRoots_Window(d);