7 files changed, 61 insertions, 25 deletions

diff --git a/src/app.c b/src/app.c
index 160d76f6..8cdb4903 100644
--- a/src/app.c
+++ b/src/app.c
@@ -498,7 +498,7 @@ static iBool loadState_App_(iApp *d) {
                     if (flags & 8) {
                         postCommand_Widget(sidebar2, "feeds.mode arg:%d", unread_FeedsMode);
                     }
-                    if (deviceType_App() != phone_AppDeviceType) {
+                    if (deviceType_App() == desktop_AppDeviceType) {
                         setWidth_SidebarWidget(sidebar,  widths[0]);
                         setWidth_SidebarWidget(sidebar2, widths[1]);
                         if (flags & 1) postCommand_Root(root, "sidebar.toggle noanim:1");
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index fe2816d2..c8430009 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -5258,7 +5258,7 @@ static void draw_DocumentWidget_(const iDocumentWidget *d) {
             mut->flags &= ~refChildrenOffset_WidgetFlag;
         }
     }
-    drawRect_Paint(&ctx.paint, docBounds, red_ColorId);
+//    drawRect_Paint(&ctx.paint, docBounds, red_ColorId);
 }
 
 /*----------------------------------------------------------------------------------------------*/
diff --git a/src/ui/mobile.c b/src/ui/mobile.c
index 90dfafde..947c0cbf 100644
--- a/src/ui/mobile.c
+++ b/src/ui/mobile.c
@@ -590,7 +590,8 @@ void makePanelItem_Mobile(iWidget *panel, const iMenuItem *item) {
                 setFlags_Widget(as_Widget(button), fixedWidth_WidgetFlag, iFalse);
             }
             setId_Widget(as_Widget(button), radId);
-            setFont_LabelWidget(button, isHorizontal ? uiLabelMedium_FontId : uiLabelBig_FontId);
+            setFont_LabelWidget(button, deviceType_App() == phone_AppDeviceType ?
+                                (isHorizontal ? uiLabelMedium_FontId : uiLabelBig_FontId) : labelFont_());
             setCheckMark_LabelWidget(button, !isHorizontal);
             setPadding_Widget(as_Widget(button), gap_UI, 1 * gap_UI, 0, 1 * gap_UI);
             updateSize_LabelWidget(button);
@@ -984,3 +985,13 @@ void setupSheetTransition_Mobile(iWidget *sheet, int flags) {
         }
     }
 }
+
+int bottomSafeInset_Mobile(void) {
+#if defined (iPlatformAppleMobile)
+    float bot;
+    safeAreaInsets_iOS(NULL, NULL, NULL, &bot);
+    return iRound(bot);
+#else
+    return 0;
+#endif
+}
diff --git a/src/ui/mobile.h b/src/ui/mobile.h
index 06955945..54f55fd2 100644
--- a/src/ui/mobile.h
+++ b/src/ui/mobile.h
@@ -56,3 +56,5 @@ enum iTransitionDir {
 
 void        setupMenuTransition_Mobile  (iWidget *menu,  iBool isIncoming);
 void        setupSheetTransition_Mobile (iWidget *sheet, int flags);
+
+int         bottomSafeInset_Mobile      (void);
diff --git a/src/ui/root.c b/src/ui/root.c
index 18a71200..a5dcd46d 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -333,6 +333,11 @@ static iBool handleRootCommands_(iWidget *root, const char *cmd) {
         openMenuFlags_Widget(menu, zero_I2(), postCommands_MenuOpenFlags | center_MenuOpenFlags);
         return iTrue;
     }
+    else if (deviceType_App() == tablet_AppDeviceType && equal_Command(cmd, "toolbar.showident")) {
+        /* No toolbar on tablet, so we handle this command here. */
+        postCommand_App("preferences idents:1");
+        return iTrue;
+    }
     else if (equal_Command(cmd, "identmenu.open")) {
         iWidget *toolBar = findWidget_Root("toolbar");
         iWidget *button = findWidget_Root(toolBar && isPortraitPhone_App() ? "toolbar.ident" : "navbar.ident");
@@ -486,6 +491,13 @@ static iBool handleRootCommands_(iWidget *root, const char *cmd) {
         SDL_PushEvent(&(SDL_Event){ .type = SDL_QUIT });
         return iTrue;
     }
+    else if (deviceType_App() == tablet_AppDeviceType && equal_Command(cmd, "window.resized")) {
+        iSidebarWidget *sidebar = findChild_Widget(root, "sidebar");
+        iSidebarWidget *sidebar2 = findChild_Widget(root, "sidebar2");
+        setWidth_SidebarWidget(sidebar, 73.0f);
+        setWidth_SidebarWidget(sidebar2, 73.0f);
+        return iFalse;
+    }
     else if (deviceType_App() == phone_AppDeviceType && equal_Command(cmd, "window.resized")) {
         /* Place the sidebar next to or under doctabs depending on orientation. */
         iSidebarWidget *sidebar = findChild_Widget(root, "sidebar");
@@ -1056,7 +1068,7 @@ static iBool handleToolBarCommands_(iWidget *toolBar, const char *cmd) {
         return iTrue;
     }
     else if (equal_Command(cmd, "toolbar.showident")) {
-        iWidget *sidebar  = findWidget_App("sidebar");
+        iWidget *sidebar = findWidget_App("sidebar");
         if (isVisible_Widget(sidebar)) {
             postCommandf_App("sidebar.toggle");
         }
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index d4b1ee20..c7acc0ef 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -35,6 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "inputwidget.h"
 #include "labelwidget.h"
 #include "listwidget.h"
+#include "mobile.h"
 #include "keys.h"
 #include "paint.h"
 #include "root.h"
@@ -206,6 +207,18 @@ int cmpTree_Bookmark(const iBookmark **a, const iBookmark **b) {
     return cmpStringCase_String(&bm1->title, &bm2->title);
 }
 
+static enum iFontId actionButtonFont_SidebarWidget_(const iSidebarWidget *d) {
+    switch (deviceType_App()) {
+        default:
+            break;
+        case phone_AppDeviceType:
+            return uiLabelBig_FontId;
+        case tablet_AppDeviceType:
+            return uiLabelMedium_FontId;
+    }
+    return d->buttonFont;
+}
+
 static iLabelWidget *addActionButton_SidebarWidget_(iSidebarWidget *d, const char *label,
                                                     const char *command, int64_t flags) {
     iLabelWidget *btn = addChildFlags_Widget(d->actions,
@@ -213,14 +226,12 @@ static iLabelWidget *addActionButton_SidebarWidget_(iSidebarWidget *d, const cha
                                              //(deviceType_App() != desktop_AppDeviceType ?
                                              // extraPadding_WidgetFlag : 0) |
                                              flags);
-    setFont_LabelWidget(btn, deviceType_App() == desktop_AppDeviceType ? /*deviceType_App() == phone_AppDeviceType && d->side == right_SidebarSide
-                                 ? uiLabelBig_FontId : */
-                        d->buttonFont : uiLabelBig_FontId);
+    setFont_LabelWidget(btn, actionButtonFont_SidebarWidget_(d));
     checkIcon_LabelWidget(btn);
     if (deviceType_App() != desktop_AppDeviceType) {
         setFlags_Widget(as_Widget(btn), frameless_WidgetFlag, iTrue);
-        setBackgroundColor_Widget(as_Widget(btn), uiBackground_ColorId);
         setTextColor_LabelWidget(btn, uiTextAction_ColorId);
+        setBackgroundColor_Widget(as_Widget(btn), uiBackground_ColorId);
     }
     return btn;
 }
@@ -886,7 +897,7 @@ void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {
                                  resizeToParentHeight_WidgetFlag |
                                  (side == left_SidebarSide ? moveToParentRightEdge_WidgetFlag
                                                            : moveToParentLeftEdge_WidgetFlag));
-    if (deviceType_App() == phone_AppDeviceType) {
+    if (deviceType_App() != desktop_AppDeviceType) {
         setFlags_Widget(d->resizer, hidden_WidgetFlag | disabled_WidgetFlag, iTrue);
     }
     setId_Widget(d->resizer, side == left_SidebarSide ? "sidebar.grab" : "sidebar2.grab");
@@ -1308,8 +1319,12 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                             drawBackgroundToBottom_WidgetFlag,
                             isPortrait_App());
             setBackgroundColor_Widget(w, isPortrait_App() ? uiBackgroundSidebar_ColorId : none_ColorId);
-            return iFalse;
         }
+        if (!isPortraitPhone_App()) {
+            /* In sliding sheet mode, sidebar is resized to fit in the safe area. */
+            setPadding_Widget(d->actions, 0, 0, 0, bottomSafeInset_Mobile());
+        }
+        return iFalse;
     }
     else if (isMetricsChange_UserEvent(ev)) {
         if (isVisible_Widget(w)) {
@@ -1348,10 +1363,6 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                 }
             }
         }
-//        else if (deviceType_App() == tablet_AppDeviceType && equal_Command(cmd, "toolbar.showident")) {
-//            postCommandf_App("sidebar.mode arg:%d toggle:1", identities_SidebarMode);
-//            return iTrue;
-//        }
         else if (isPortraitPhone_App() && isVisible_Widget(w) && d->side == left_SidebarSide &&
                  equal_Command(cmd, "swipe.forward")) {
             postCommand_App("sidebar.toggle");
diff --git a/src/ui/util.c b/src/ui/util.c
index 8aedef99..9576f5e2 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -924,17 +924,17 @@ static void updateMenuItemFonts_Widget_(iWidget *d) {
             if (isWrapped_LabelWidget(label)) {
                 continue;
             }
-            if (deviceType_App() == desktop_AppDeviceType) {
-                setFont_LabelWidget(label, isCaution ? uiLabelBold_FontId : uiLabel_FontId);
+            switch (deviceType_App()) {
+                case desktop_AppDeviceType:
+                    setFont_LabelWidget(label, isCaution ? uiLabelBold_FontId : uiLabel_FontId);
+                    break;
+                case tablet_AppDeviceType:
+                    setFont_LabelWidget(label, isCaution ? uiLabelMediumBold_FontId : uiLabelMedium_FontId);
+                    break;
+                case phone_AppDeviceType:
+                    setFont_LabelWidget(label, isCaution ? uiLabelBigBold_FontId : uiLabelBig_FontId);
+                    break;
             }
-            else { //if (isPortraitPhone) {
-                //if (!isSlidePanel) {
-                setFont_LabelWidget(label, isCaution ? uiLabelBigBold_FontId : uiLabelBig_FontId);
-              //  }
-            }
-//            else {
-//                setFont_LabelWidget(label, isCaution ? uiContentBold_FontId : uiContent_FontId);
-//            }
         }
         else if (childCount_Widget(i.object)) {
             updateMenuItemFonts_Widget_(i.object);
@@ -1734,7 +1734,7 @@ iWidget *makeDialogButtons_Widget(const iMenuItem *actions, size_t numActions) {
         addChildFlags_Widget(div, iClob(new_Widget()), expand_WidgetFlag);
     }
     int fonts[2] = { uiLabel_FontId, uiLabelBold_FontId };
-    if (deviceType_App() == phone_AppDeviceType) {
+    if (deviceType_App() != desktop_AppDeviceType) {
         fonts[0] = uiLabelBig_FontId;
         fonts[1] = uiLabelBigBold_FontId;
     }