6 files changed, 51 insertions, 25 deletions

diff --git a/src/app.c b/src/app.c
index 12c7dc7d..88d912ab 100644
--- a/src/app.c
+++ b/src/app.c
@@ -2562,7 +2562,8 @@ iBool handleCommand_App(const char *cmd) {
         iAnyObject *prog = findWidget_Root("feeds.progress");
         const iWidget *navBar = findWidget_Root("navbar");
         updateTextAndResizeWidthCStr_LabelWidget(
-            prog, flags_Widget(navBar) & tight_WidgetFlag ? "\u2605" : "\u2605 ${status.feeds}");
+            prog, flags_Widget(navBar) & tight_WidgetFlag || deviceType_App() == phone_AppDeviceType ?
+                                                 "\u2605" : "\u2605 ${status.feeds}");
         showCollapsed_Widget(prog, iTrue);
         return iFalse;
     }
diff --git a/src/app.h b/src/app.h
index 2dd5198d..5d1d42e1 100644
--- a/src/app.h
+++ b/src/app.h
@@ -86,6 +86,7 @@ uint32_t    elapsedSinceLastTicker_App  (void); /* milliseconds */
 iBool               isLandscape_App     (void);
 iLocalDef iBool     isPortrait_App      (void) { return !isLandscape_App(); }
 enum iAppDeviceType deviceType_App      (void);
+iLocalDef iBool     isPortraitPhone_App (void) { return isPortrait_App() && deviceType_App() == phone_AppDeviceType; }
 iGmCerts *          certs_App           (void);
 iVisited *          visited_App         (void);
 iBookmarks *        bookmarks_App       (void);
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index cf128017..9571a97e 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -80,6 +80,7 @@ enum iInputWidgetFlag {
     markWords_InputWidgetFlag        = iBit(8),
     needUpdateBuffer_InputWidgetFlag = iBit(9),
     enterKeyEnabled_InputWidgetFlag  = iBit(10),
+    enterKeyInsertsLineFeed_InputWidgetFlag = iBit(11),
 };
 
 /*----------------------------------------------------------------------------------------------*/
@@ -347,8 +348,11 @@ void init_InputWidget(iInputWidget *d, size_t maxLen) {
     d->lastCursor   = 0;
     d->cursorLine   = 0;
     d->lastUpdateWidth = 0;
-    d->verticalMoveX = -1; /* TODO: Use this. */
-    d->inFlags      = eatEscape_InputWidgetFlag | enterKeyEnabled_InputWidgetFlag;
+    d->verticalMoveX   = -1; /* TODO: Use this. */
+    d->inFlags         = eatEscape_InputWidgetFlag | enterKeyEnabled_InputWidgetFlag;
+    if (deviceType_App() != desktop_AppDeviceType) {
+        d->inFlags |= enterKeyInsertsLineFeed_InputWidgetFlag;
+    }
     iZap(d->mark);
     setMaxLen_InputWidget(d, maxLen);
     d->maxLayoutLines = iInvalidSize;
@@ -464,6 +468,10 @@ void setValidator_InputWidget(iInputWidget *d, iInputWidgetValidatorFunc validat
     d->validatorContext = context;
 }
 
+void setEnterInsertsLF_InputWidget(iInputWidget *d, iBool enterInsertsLF) {
+    iChangeFlags(d->inFlags, enterKeyInsertsLineFeed_InputWidgetFlag, enterInsertsLF);
+}
+
 void setEnterKeyEnabled_InputWidget(iInputWidget *d, iBool enterKeyEnabled) {
     iChangeFlags(d->inFlags, enterKeyEnabled_InputWidgetFlag, enterKeyEnabled);
 }
@@ -1166,7 +1174,7 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
             case SDLK_KP_ENTER:
                 if (mods == KMOD_SHIFT || (d->maxLen == 0 &&
                                            ~d->inFlags & isUrl_InputWidgetFlag &&
-                                           deviceType_App() != desktop_AppDeviceType)) {
+                                           d->inFlags & enterKeyInsertsLineFeed_InputWidgetFlag)) {
                     pushUndo_InputWidget_(d);
                     deleteMarked_InputWidget_(d);
                     insertChar_InputWidget_(d, '\n');
diff --git a/src/ui/inputwidget.h b/src/ui/inputwidget.h
index f8c5bf1e..c70d9ad6 100644
--- a/src/ui/inputwidget.h
+++ b/src/ui/inputwidget.h
@@ -51,6 +51,7 @@ void    setCursor_InputWidget           (iInputWidget *, size_t pos);
 void    setContentPadding_InputWidget   (iInputWidget *, int left, int right); /* only affects the text entry */
 void    setMaxLayoutLines_InputWidget   (iInputWidget *, size_t maxLayoutLines);
 void    setValidator_InputWidget        (iInputWidget *, iInputWidgetValidatorFunc validator, void *context);
+void    setEnterInsertsLF_InputWidget   (iInputWidget *, iBool enterInsertsLF);
 void    setEnterKeyEnabled_InputWidget  (iInputWidget *, iBool enterKeyEnabled);
 void    begin_InputWidget               (iInputWidget *);
 void    end_InputWidget                 (iInputWidget *, iBool accept);
diff --git a/src/ui/root.c b/src/ui/root.c
index 52bc7364..91e19e46 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -834,20 +834,20 @@ static iBool handleToolBarCommands_(iWidget *toolBar, const char *cmd) {
         const int viewHeight = size_Root(get_Root()).y;
         if (arg_Command(cmd) >= 0) {
             postCommandf_App("sidebar.mode arg:%d show:1", arg_Command(cmd));
-            if (!isVisible) {
-                setVisualOffset_Widget(sidebar, viewHeight, 0, 0);
-                setVisualOffset_Widget(sidebar, 0, 400, easeOut_AnimFlag | softer_AnimFlag);
-            }
+//            if (!isVisible) {
+//                setVisualOffset_Widget(sidebar, viewHeight, 0, 0);
+//                setVisualOffset_Widget(sidebar, 0, 400, easeOut_AnimFlag | softer_AnimFlag);
+//            }
         }
         else {
             postCommandf_App("sidebar.toggle");
-            if (isVisible) {
-                setVisualOffset_Widget(sidebar, height_Widget(sidebar), 250, easeIn_AnimFlag);
-            }
-            else {
-                setVisualOffset_Widget(sidebar, viewHeight, 0, 0);
-                setVisualOffset_Widget(sidebar, 0, 400, easeOut_AnimFlag | softer_AnimFlag);
-            }
+//            if (isVisible) {
+//                setVisualOffset_Widget(sidebar, height_Widget(sidebar), 250, easeIn_AnimFlag);
+//            }
+//            else {
+//                setVisualOffset_Widget(sidebar, viewHeight, 0, 0);
+//                setVisualOffset_Widget(sidebar, 0, 400, easeOut_AnimFlag | softer_AnimFlag);
+//            }
         }
         return iTrue;
     }
@@ -855,7 +855,10 @@ static iBool handleToolBarCommands_(iWidget *toolBar, const char *cmd) {
         /* TODO: Clean this up. */
         iWidget *sidebar  = findWidget_App("sidebar");
         iWidget *sidebar2 = findWidget_App("sidebar2");
-        dismissSidebar_(sidebar, "toolbar.view");
+        //dismissSidebar_(sidebar, "toolbar.view");
+        if (isVisible_Widget(sidebar)) {
+            postCommandf_App("sidebar.toggle");
+        }
         const iBool isVisible = isVisible_Widget(sidebar2);
         //        setFlags_Widget(findChild_Widget(toolBar, "toolbar.ident"), noBackground_WidgetFlag,
         //                        isVisible);
@@ -1225,6 +1228,7 @@ void createUserInterface_Root(iRoot *d) {
         setHint_InputWidget(input, "${hint.findtext}");
         setSelectAllOnFocus_InputWidget(input, iTrue);
         setEatEscape_InputWidget(input, iFalse); /* unfocus and close with one keypress */
+        setEnterInsertsLF_InputWidget(input, iFalse);
         setId_Widget(addChildFlags_Widget(searchBar, iClob(input), expand_WidgetFlag),
                      "find.input");
         addChild_Widget(searchBar, iClob(newIcon_LabelWidget("  \u2b9f  ", 'g', KMOD_PRIMARY, "find.next")));
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 27646b22..2e1e138e 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -678,8 +678,8 @@ void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {
                              iClob(buttons),
                              arrangeHorizontal_WidgetFlag |
                                  resizeWidthOfChildren_WidgetFlag |
-                             arrangeHeight_WidgetFlag | resizeToParentWidth_WidgetFlag |
-                             drawBackgroundToHorizontalSafeArea_WidgetFlag);
+                             arrangeHeight_WidgetFlag | resizeToParentWidth_WidgetFlag); // |
+//                             drawBackgroundToHorizontalSafeArea_WidgetFlag);
         setBackgroundColor_Widget(buttons, uiBackgroundSidebar_ColorId);
     }
     else {
@@ -700,13 +700,13 @@ void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {
     setPadding_Widget(as_Widget(d->list), 0, gap_UI, 0, gap_UI);
     addChildFlags_Widget(listAndActions,
                          iClob(d->list),
-                         expand_WidgetFlag | drawBackgroundToHorizontalSafeArea_WidgetFlag);
+                         expand_WidgetFlag); // | drawBackgroundToHorizontalSafeArea_WidgetFlag);
     setId_Widget(addChildPosFlags_Widget(listAndActions,
                                          iClob(d->actions = new_Widget()),
                                          isPhone ? front_WidgetAddPos : back_WidgetAddPos,
                                          arrangeHorizontal_WidgetFlag | arrangeHeight_WidgetFlag |
-                                             resizeWidthOfChildren_WidgetFlag |
-                                             drawBackgroundToHorizontalSafeArea_WidgetFlag),
+                                         resizeWidthOfChildren_WidgetFlag), // |
+//                                             drawBackgroundToHorizontalSafeArea_WidgetFlag),
                  "actions");
     setBackgroundColor_Widget(d->actions, uiBackgroundSidebar_ColorId);
     d->contextItem = NULL;
@@ -938,7 +938,7 @@ static iBool handleSidebarCommand_SidebarWidget_(iSidebarWidget *d, const char *
         }
         const iBool isAnimated = prefs_App()->uiAnimations &&
                                  argLabel_Command(cmd, "noanim") == 0 &&
-                                 (deviceType_App() != phone_AppDeviceType);
+                                 (d->side == left_SideBarSide || deviceType_App() != phone_AppDeviceType);
         int visX = 0;
         if (isVisible_Widget(w)) {
             visX = left_Rect(bounds_Widget(w)) - left_Rect(w->root->widget->rect);
@@ -989,6 +989,15 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
             if (isVisible_Widget(w)) {
                 postCommand_Widget(w, "sidebar.toggle");
             }
+            setFlags_Widget(findChild_Widget(w, "buttons"),
+                            drawBackgroundToHorizontalSafeArea_WidgetFlag,
+                            isLandscape_App());
+            setFlags_Widget(findChild_Widget(w, "actions"),
+                            drawBackgroundToHorizontalSafeArea_WidgetFlag,
+                            isLandscape_App());
+            setFlags_Widget(as_Widget(d->list),
+                            drawBackgroundToHorizontalSafeArea_WidgetFlag,
+                            isLandscape_App());
             return iFalse;
         }
     }
@@ -1528,9 +1537,11 @@ static void draw_SidebarWidget_(const iSidebarWidget *d) {
     const iRect    bounds = bounds_Widget(w);
     iPaint p;
     init_Paint(&p);
-    if (flags_Widget(w) & visualOffset_WidgetFlag &&
-        flags_Widget(w) & horizontalOffset_WidgetFlag && isVisible_Widget(w)) {
-        fillRect_Paint(&p, boundsWithoutVisualOffset_Widget(w), tmBackground_ColorId);
+    if (deviceType_App() != phone_AppDeviceType) {
+        if (flags_Widget(w) & visualOffset_WidgetFlag &&
+            flags_Widget(w) & horizontalOffset_WidgetFlag && isVisible_Widget(w)) {
+            fillRect_Paint(&p, boundsWithoutVisualOffset_Widget(w), tmBackground_ColorId);
+        }
     }
     draw_Widget(w);
     if (isVisible_Widget(w)) {