10 files changed, 72 insertions, 53 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 262bbcb9..ee9c14d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,6 +44,8 @@ option (ENABLE_HARFBUZZ_MINIMAL "Build the HarfBuzz library with minimal depende
 option (ENABLE_IDLE_SLEEP       "While idle, sleep in the main thread instead of waiting for events" ON)
 option (ENABLE_IPC              "Use IPC to communicate between running instances" ON)
 option (ENABLE_KERNING          "Enable kerning in font renderer (slower)" ON)
+option (ENABLE_MOBILE_PHONE     "Use the phone mobile UI design instead of desktop UI" OFF)
+option (ENABLE_MOBILE_TABLET    "Use the tablet mobile UI design instead of desktop UI" OFF)
 option (ENABLE_MPG123           "Use mpg123 for decoding MPEG audio" ON)
 option (ENABLE_RELATIVE_EMBED   "Resources should always be found via relative path" OFF)
 option (ENABLE_RESIZE_DRAW      "Force window to redraw during resizing" ${DEFAULT_RESIZE_DRAW})
@@ -279,6 +281,16 @@ if (MOBILE)
     add_definitions (-DiPlatformMobile=1)
 else ()
     add_definitions (-DiPlatformDesktop=1)
+    # Forced UI design.
+    if (ENABLE_MOBILE_PHONE OR ENABLE_MOBILE_TABLET)
+        add_definitions (-DiPlatformMobile=1)
+    endif ()
+    if (ENABLE_MOBILE_PHONE)
+        add_definitions (-DiPlatformMobilePhone=1)
+    endif ()
+    if (ENABLE_MOBILE_TABLET)
+        add_definitions (-DiPlatformMobileTablet=1)
+    endif ()
 endif ()
 
 # Target.
@@ -300,37 +312,37 @@ target_compile_options (app PUBLIC
     -DSTB_VORBIS_NO_INTEGER_CONVERSION=1
 )
 target_compile_definitions (app PUBLIC LAGRANGE_APP_VERSION="${PROJECT_VERSION}")
+if (ENABLE_CUSTOM_FRAME AND MSYS)
+    target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_CUSTOM_FRAME=1)
+endif ()
+if (ENABLE_DOWNLOAD_EDIT)
+    target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_DOWNLOAD_EDIT=1)
+endif ()
+if (ENABLE_IDLE_SLEEP)
+    target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_IDLE_SLEEP=1)
+endif ()
 if (ENABLE_IPC)
     target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_IPC=1)
 endif ()
-if (ENABLE_X11_SWRENDER)
-    target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_X11_SWRENDER=1)
-endif ()
 if (ENABLE_KERNING)
     target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_KERNING=1)
 endif ()
-if (ENABLE_WINDOWPOS_FIX)
-    target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_WINDOWPOS_FIX=1)
-endif ()
 if (ENABLE_MPG123 AND MPG123_FOUND)
     target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_MPG123=1)
     target_link_libraries (app PUBLIC PkgConfig::MPG123)
 endif ()
+if (ENABLE_RESIZE_DRAW)
+    target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_RESIZE_DRAW=1)
+endif ()
 if (ENABLE_WEBP AND WEBP_FOUND)
     target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_WEBP=1)
     target_link_libraries (app PUBLIC PkgConfig::WEBP)
 endif ()
-if (ENABLE_IDLE_SLEEP)
-    target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_IDLE_SLEEP=1)
-endif ()
-if (ENABLE_DOWNLOAD_EDIT)
-    target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_DOWNLOAD_EDIT=1)
-endif ()
-if (ENABLE_CUSTOM_FRAME AND MSYS)
-    target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_CUSTOM_FRAME=1)
+if (ENABLE_WINDOWPOS_FIX)
+    target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_WINDOWPOS_FIX=1)
 endif ()
-if (ENABLE_RESIZE_DRAW)
-    target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_RESIZE_DRAW=1)
+if (ENABLE_X11_SWRENDER)
+    target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_X11_SWRENDER=1)
 endif ()
 target_link_libraries (app PUBLIC the_Foundation::the_Foundation)
 target_link_libraries (app PUBLIC ${SDL2_LDFLAGS})
diff --git a/src/app.c b/src/app.c
index bf781c03..91472075 100644
--- a/src/app.c
+++ b/src/app.c
@@ -1575,7 +1575,11 @@ iBool isLandscape_App(void) {
 }
 
 enum iAppDeviceType deviceType_App(void) {
-#if defined (iPlatformAppleMobile)
+#if defined (iPlatformMobilePhone)
+    return phone_AppDeviceType;
+#elif defined (iPlatformMobileTablet)
+    return tablet_AppDeviceType;
+#elif defined (iPlatformAppleMobile)
     return isPhone_iOS() ? phone_AppDeviceType : tablet_AppDeviceType;
 #else
     return desktop_AppDeviceType;
@@ -2472,7 +2476,7 @@ iBool handleCommand_App(const char *cmd) {
     }
     else if (equal_Command(cmd, "tabs.close")) {
         iWidget *tabs = findWidget_App("doctabs");
-#if defined (iPlatformAppleMobile)
+#if defined (iPlatformMobile)
         /* Can't close the last on mobile. */
         if (tabCount_Widget(tabs) == 1 && numRoots_Window(get_Window()) == 1) {
             postCommand_App("navigate.home");
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index edc36a49..58294c6a 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -68,7 +68,7 @@ static iInt2 padding_LabelWidget_(const iLabelWidget *d, int corner) {
                              : corner == 1 ? init_I2(w->padding[2], w->padding[1])
                              : corner == 2 ? init_I2(w->padding[2], w->padding[3])
                              : init_I2(w->padding[0], w->padding[3]));
-#if defined (iPlatformAppleMobile)
+#if defined (iPlatformMobile)
     return add_I2(widgetPad,
                   init_I2(flags & tight_WidgetFlag ? 2 * gap_UI : (4 * gap_UI),
                           (flags & extraPadding_WidgetFlag ? 1.5f : 1.0f) * 3 * gap_UI / 2));
diff --git a/src/ui/lookupwidget.c b/src/ui/lookupwidget.c
index a0a507ca..bf190d58 100644
--- a/src/ui/lookupwidget.c
+++ b/src/ui/lookupwidget.c
@@ -388,7 +388,7 @@ void init_LookupWidget(iLookupWidget *d) {
     init_Widget(w);
     setId_Widget(w, "lookup");
     setFlags_Widget(w, focusable_WidgetFlag, iTrue);
-#if defined (iPlatformAppleMobile)
+#if defined (iPlatformMobile)
     setFlags_Widget(w, unhittable_WidgetFlag, iTrue);
 #endif
     d->list = addChildFlags_Widget(w, iClob(new_ListWidget()),
diff --git a/src/ui/metrics.c b/src/ui/metrics.c
index 32561ed7..53a52afb 100644
--- a/src/ui/metrics.c
+++ b/src/ui/metrics.c
@@ -33,7 +33,7 @@ iInt2 gap2_UI     = { defaultGap_Metrics, defaultGap_Metrics };
 int   fontSize_UI = defaultFontSize_Metrics;
 
 void setScale_Metrics(float scale) {
-#if defined (iPlatformAppleMobile)
+#if defined (iPlatformMobile)
     /* iPad needs a bit larger UI elements as the viewing distance is generally longer.*/
     if (deviceType_App() == tablet_AppDeviceType) {
         scale *= 1.1f;
diff --git a/src/ui/mobile.c b/src/ui/mobile.c
index 0ff3fe85..168a92b8 100644
--- a/src/ui/mobile.c
+++ b/src/ui/mobile.c
@@ -57,11 +57,13 @@ static enum iFontId labelBoldFont_(void) {
 
 static void updatePanelSheetMetrics_(iWidget *sheet) {
     iWidget *navi       = findChild_Widget(sheet, "panel.navi");
-    iWidget *naviPad    = child_Widget(navi, 0);
+//    iWidget *naviPad    = child_Widget(navi, 0);
     int      naviHeight = lineHeight_Text(labelFont_()) + 4 * gap_UI;
+#if defined (iPlatformMobile)
+    float left = 0.0f, right = 0.0f, top = 0.0f, bottom = 0.0f;
 #if defined (iPlatformAppleMobile)
-    float left, right, top, bottom;
     safeAreaInsets_iOS(&left, &top, &right, &bottom);
+#endif
     setPadding_Widget(sheet, left, 0, right, 0);
     navi->rect.pos = init_I2(left, top);
     iConstForEach(PtrArray, i, findChildren_Widget(sheet, "panel.toppad")) {
diff --git a/src/ui/root.c b/src/ui/root.c
index a8b9f998..a72f002c 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -83,7 +83,7 @@ static const iMenuItem navMenuItems_[] = {
 };
 #endif
 
-#if defined (iPlatformAppleMobile)
+#if defined (iPlatformMobile)
 /* Tablet menu. */
 static const iMenuItem tabletNavMenuItems_[] = {
     { folder_Icon " ${menu.openfile}", SDLK_o, KMOD_PRIMARY, "file.open" },
@@ -120,9 +120,9 @@ static const iMenuItem phoneNavMenuItems_[] = {
     { "---", 0, 0, NULL },
     { gear_Icon " Settings...", SDLK_COMMA, KMOD_PRIMARY, "preferences" },
 };
-#endif /* AppleMobile */
+#endif /* Mobile */
 
-#if defined (iPlatformAppleMobile)
+#if defined (iPlatformMobile)
 static const iMenuItem identityButtonMenuItems_[] = {
     { "${menu.identity.notactive}", 0, 0, "ident.showactive" },
     { "---", 0, 0, NULL },
@@ -498,9 +498,10 @@ static void checkLoadAnimation_Root_(iRoot *d) {
 
 void updatePadding_Root(iRoot *d) {
     if (d == NULL) return;
-#if defined (iPlatformAppleMobile)
     iWidget *toolBar = findChild_Widget(d->widget, "toolbar");
-    float left, top, right, bottom;
+    float bottom = 0.0f;
+#if defined (iPlatformAppleMobile)
+    float left, top, right;
     safeAreaInsets_iOS(&left, &top, &right, &bottom);
     /* Respect the safe area insets. */ {
         setPadding_Widget(findChild_Widget(d->widget, "navdiv"), left, top, right, 0);
@@ -508,6 +509,7 @@ void updatePadding_Root(iRoot *d) {
             setPadding_Widget(toolBar, left, 0, right, bottom);
         }
     }
+#endif
     if (toolBar) {
         /* TODO: get this from toolBar height, but it's buggy for some reason */
         const int sidebarBottomPad = isPortrait_App() ? 11 * gap_UI + bottom : 0;
@@ -517,7 +519,6 @@ void updatePadding_Root(iRoot *d) {
            are not arranged correctly until it's hidden and reshown. */
     }
     /* Note that `handleNavBarCommands_` also adjusts padding and spacing. */
-#endif
 }
 
 void updateToolbarColors_Root(iRoot *d) {
@@ -829,13 +830,13 @@ static iBool handleSearchBarCommands_(iWidget *searchBar, const char *cmd) {
     return iFalse;
 }
 
-#if defined (iPlatformAppleMobile)
+#if defined (iPlatformMobile)
 static void dismissSidebar_(iWidget *sidebar, const char *toolButtonId) {
     if (isVisible_Widget(sidebar)) {
         postCommandf_App("%s.toggle", cstr_String(id_Widget(sidebar)));
-        if (toolButtonId) {
+//        if (toolButtonId) {
             //            setFlags_Widget(findWidget_App(toolButtonId), noBackground_WidgetFlag, iTrue);
-        }
+//        }
         setVisualOffset_Widget(sidebar, height_Widget(sidebar), 250, easeIn_AnimFlag);
     }
 }
@@ -909,7 +910,7 @@ static iBool handleToolBarCommands_(iWidget *toolBar, const char *cmd) {
     }
     return iFalse;
 }
-#endif /* defined (iPlatformAppleMobile) */
+#endif /* defined (iPlatformMobile) */
 
 static iLabelWidget *newLargeIcon_LabelWidget(const char *text, const char *cmd) {
     iLabelWidget *lab = newIcon_LabelWidget(text, 0, 0, cmd);
@@ -1198,8 +1199,8 @@ void createUserInterface_Root(iRoot *d) {
 #if defined (iPlatformMobile)
         const iBool isPhone = (deviceType_App() == phone_AppDeviceType);
 #endif
-#if !defined (iHaveNativeMenus)
-#   if defined (iPlatformAppleMobile)
+#if !defined (iHaveNativeMenus) || defined (iPlatformMobile)
+#   if defined (iPlatformMobile)
         iLabelWidget *navMenu =
             makeMenuButton_LabelWidget(menu_Icon, isPhone ? phoneNavMenuItems_ : tabletNavMenuItems_,
                                        isPhone ? iElemCount(phoneNavMenuItems_) : iElemCount(tabletNavMenuItems_));
@@ -1280,9 +1281,9 @@ void createUserInterface_Root(iRoot *d) {
         addChild_Widget(searchBar, iClob(newIcon_LabelWidget("  \u2b9d  ", 'g', KMOD_PRIMARY | KMOD_SHIFT, "find.prev")));
         addChild_Widget(searchBar, iClob(newIcon_LabelWidget(close_Icon, SDLK_ESCAPE, 0, "find.close")));
     }
-#if defined (iPlatformAppleMobile)
+#if defined (iPlatformMobile)
     /* Bottom toolbar. */
-    if (isPhone_iOS()) {
+    if (deviceType_App() == phone_AppDeviceType) {
         iWidget *toolBar = new_Widget();
         addChild_Widget(root, iClob(toolBar));
         setId_Widget(toolBar, "toolbar");
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 767847ac..ea76a835 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -644,7 +644,7 @@ void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {
     d->buttonFont = uiLabel_FontId;
     d->itemFonts[0] = uiContent_FontId;
     d->itemFonts[1] = uiContentBold_FontId;
-#if defined (iPlatformAppleMobile)
+#if defined (iPlatformMobile)
     if (deviceType_App() == phone_AppDeviceType) {
         d->itemFonts[0] = defaultBig_FontId;
         d->itemFonts[1] = defaultBigBold_FontId;
diff --git a/src/ui/text.c b/src/ui/text.c
index 06043c7b..c4596d1c 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -361,7 +361,7 @@ static void initFonts_Text_(iText *d) {
         h12Font = &fontIosevkaTermExtended_Embedded;
         h3Font  = &fontIosevkaTermExtended_Embedded;
     }
-#if defined (iPlatformAppleMobile)
+#if defined (iPlatformMobile)
     const float uiSize = fontSize_UI * 1.1f;
 #else
     const float uiSize = fontSize_UI;
diff --git a/src/ui/window.c b/src/ui/window.c
index febf5fe8..3bafd9a4 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -440,7 +440,11 @@ void init_Window(iWindow *d, iRect rect) {
     if (left_Rect(rect) >= 0 || top_Rect(rect) >= 0) {
         SDL_SetWindowPosition(d->win, left_Rect(rect), top_Rect(rect));
     }
+#if defined (iPlatformMobile)
+    const iInt2 minSize = zero_I2(); /* windows aren't independently resizable */
+#else
     const iInt2 minSize = init_I2(425, 325);
+#endif
     SDL_SetWindowMinimumSize(d->win, minSize.x, minSize.y);
     SDL_SetWindowTitle(d->win, "Lagrange");
     /* Some info. */ {
@@ -709,7 +713,6 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
                 }
             }
 #endif /* defined LAGRANGE_ENABLE_CUSTOM_FRAME */
-            //printf("MOVED: %d, %d\n", ev->data1, ev->data2); fflush(stdout);
             if (unsnap_Window_(d, &newPos)) {
                 return iTrue;
             }
@@ -750,7 +753,13 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
         case SDL_WINDOWEVENT_MINIMIZED:
             d->isMinimized = iTrue;
             return iTrue;
-#endif /* defined (iPlatformDesktop) */
+#else /* if defined (!iPlatformDesktop) */
+        case SDL_WINDOWEVENT_RESIZED:
+            /* On mobile, this occurs when the display is rotated. */
+            invalidate_Window(d);
+            postRefresh_App();
+            return iTrue;
+#endif
         case SDL_WINDOWEVENT_LEAVE:
             unhover_Widget();
             d->isMouseInside = iFalse;
@@ -760,19 +769,12 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
             d->isMouseInside = iTrue;
             postCommand_App("window.mouse.entered");
             return iTrue;
-#if defined (iPlatformMobile)
-        case SDL_WINDOWEVENT_RESIZED:
-            /* On mobile, this occurs when the display is rotated. */
-            invalidate_Window(d);
-            postRefresh_App();
-            return iTrue;
-#endif
         case SDL_WINDOWEVENT_FOCUS_GAINED:
             d->focusGainedAt = SDL_GetTicks();
             setCapsLockDown_Keys(iFalse);
             postCommand_App("window.focus.gained");
             d->isExposed = iTrue;
-#if defined (iPlatformMobile)
+#if !defined (iPlatformDesktop)
             /* Returned to foreground, may have lost buffered content. */
             invalidate_Window_(d, iTrue);
             postCommand_App("window.unfreeze");
@@ -780,7 +782,7 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
             return iFalse;
         case SDL_WINDOWEVENT_FOCUS_LOST:
             postCommand_App("window.focus.lost");
-#if defined (iPlatformMobile)
+#if !defined (iPlatformDesktop)
             setFreezeDraw_Window(d, iTrue);
 #endif
             return iFalse;
@@ -1020,7 +1022,6 @@ void draw_Window(iWindow *d) {
     if (d->isDrawFrozen) {
         return;
     }
-//#if defined (iPlatformMobile)
     /* Check if root needs resizing. */ {
         iInt2 renderSize;
         SDL_GetRendererOutputSize(d->render, &renderSize.x, &renderSize.y);
@@ -1029,7 +1030,6 @@ void draw_Window(iWindow *d) {
             processEvents_App(postedEventsOnly_AppEventMode);
         }
     }
-//#endif
     const int   winFlags = SDL_GetWindowFlags(d->win);
     const iBool gotFocus = (winFlags & SDL_WINDOW_INPUT_FOCUS) != 0;
     iPaint p;
@@ -1037,7 +1037,7 @@ void draw_Window(iWindow *d) {
     /* Clear the window. The clear color is visible as a border around the window
        when the custom frame is being used. */ {
         setCurrent_Root(d->roots[0]);
-#if defined (iPlatformAppleMobile)
+#if defined (iPlatformMobile)
        iColor back = get_Color(uiBackground_ColorId);
        if (deviceType_App() == phone_AppDeviceType) {
            /* Page background extends to safe area, so fill it completely. */