4 files changed, 18 insertions, 10 deletions

diff --git a/src/app.c b/src/app.c
index d259f541..3f0ec2c4 100644
--- a/src/app.c
+++ b/src/app.c
@@ -2153,7 +2153,7 @@ iBool handleCommand_App(const char *cmd) {
         iWidget *tabs = findWidget_App("doctabs");
 #if defined (iPlatformAppleMobile)
         /* Can't close the last on mobile. */
-        if (tabCount_Widget(tabs) == 1) {
+        if (tabCount_Widget(tabs) == 1 && numRoots_Window(get_Window()) == 1) {
             postCommand_App("navigate.home");
             return iTrue;
         }
@@ -2331,7 +2331,9 @@ iBool handleCommand_App(const char *cmd) {
                                         bookmarkTitle_DocumentWidget(doc),
                                         siteIcon_GmDocument(document_DocumentWidget(doc)));
         }
-        postCommand_App("focus.set id:bmed.title");
+        if (deviceType_App() == desktop_AppDeviceType) {
+            postCommand_App("focus.set id:bmed.title");
+        }
         return iTrue;
     }
     else if (equal_Command(cmd, "feeds.subscribe")) {
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index 3b72cc60..64fd2ed0 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -148,6 +148,8 @@ iLocalDef iInt2 padding_(void) {
     return init_I2(gap_UI / 2, gap_UI / 2);
 }
 
+#define extraPaddingHeight_ (1.25f * gap_UI)
+
 static iRect contentBounds_InputWidget_(const iInputWidget *d) {
     const iWidget *w         = constAs_Widget(d);
     //    const iRect widgetBounds = bounds_Widget(w);
@@ -157,7 +159,7 @@ static iRect contentBounds_InputWidget_(const iInputWidget *d) {
     shrink_Rect(&bounds, init_I2(gap_UI * (flags_Widget(w) & tight_WidgetFlag ? 1 : 2), 0));
     bounds.pos.y += padding_().y / 2;
     if (flags_Widget(w) & extraPadding_WidgetFlag) {
-        bounds.pos.y += gap_UI;
+        bounds.pos.y += extraPaddingHeight_ / 2;
     }
     return bounds;
 }
@@ -205,7 +207,7 @@ static void updateSizeForFixedLength_InputWidget_(iInputWidget *d) {
         /* Set a fixed size based on maximum possible width of the text. */
         iBlock *content = new_Block(d->maxLen);
         fill_Block(content, 'M');
-        int extraHeight = (flags_Widget(as_Widget(d)) & extraPadding_WidgetFlag ? 2 * gap_UI : 0);
+        int extraHeight = (flags_Widget(as_Widget(d)) & extraPadding_WidgetFlag ? extraPaddingHeight_ : 0);
         setFixedSize_Widget(
             as_Widget(d),
             add_I2(measure_Text(d->font, cstr_Block(content)),
@@ -299,7 +301,7 @@ static int contentHeight_InputWidget_(const iInputWidget *d, iBool forLayout) {
     if (forLayout) {
         numLines = iMin(numLines, d->maxLayoutLines);
     }
-    return numLines * lineHeight_Text(d->font);
+    return (int) numLines * lineHeight_Text(d->font);
 }
 
 static void updateMetrics_InputWidget_(iInputWidget *d) {
@@ -308,7 +310,7 @@ static void updateMetrics_InputWidget_(iInputWidget *d) {
     /* Caller must arrange the width, but the height is fixed. */
     w->rect.size.y = contentHeight_InputWidget_(d, iTrue) + 3.0f * padding_().y; /* TODO: Why 3x? */
     if (flags_Widget(w) & extraPadding_WidgetFlag) {
-        w->rect.size.y += 2 * gap_UI;
+        w->rect.size.y += extraPaddingHeight_;
     }
     invalidateBuffered_InputWidget_(d);
     postCommand_Widget(d, "input.resized");
@@ -960,7 +962,7 @@ static iRect bounds_InputWidget_(const iInputWidget *d) {
     }
     bounds.size.y = contentHeight_InputWidget_(d, iFalse) + 3 * padding_().y;
     if (w->flags & extraPadding_WidgetFlag) {
-        bounds.size.y += 2 * gap_UI;
+        bounds.size.y += extraPaddingHeight_;
     }
     return bounds;
 }
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index 7ee7bfc8..95f281be 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -66,7 +66,7 @@ static iInt2 padding_LabelWidget_(const iLabelWidget *d, int corner) {
 #if defined (iPlatformAppleMobile)
     return add_I2(widgetPad,
                   init_I2(flags & tight_WidgetFlag ? 2 * gap_UI : (4 * gap_UI),
-                          (flags & extraPadding_WidgetFlag ? 1.5f : 1) * 3 * gap_UI / 2));
+                          (flags & extraPadding_WidgetFlag ? 1.5f : 1.0f) * 3 * gap_UI / 2));
 #else
     return add_I2(widgetPad,
                   init_I2(flags & tight_WidgetFlag ? 3 * gap_UI / 2 : (3 * gap_UI),
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index cb6dab65..86410d11 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -1142,7 +1142,9 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                 }
                 if (isCommand_Widget(w, ev, "feed.entry.bookmark")) {
                     makeBookmarkCreation_Widget(&item->url, &item->label, item->icon);
-                    postCommand_App("focus.set id:bmed.title");
+                    if (deviceType_App() == desktop_AppDeviceType) {
+                        postCommand_App("focus.set id:bmed.title");
+                    }
                     return iTrue;
                 }
                 iBookmark *feedBookmark = get_Bookmarks(bookmarks_App(), item->id);
@@ -1290,7 +1292,9 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                     &item->url,
                     collect_String(newRange_String(urlHost_String(&item->url))),
                     0x1f310 /* globe */);
-                postCommand_App("focus.set id:bmed.title");
+                if (deviceType_App() == desktop_AppDeviceType) {
+                    postCommand_App("focus.set id:bmed.title");
+                }
             }
         }
         else if (equal_Command(cmd, "history.clear")) {