Merge branch 'dev' into work/typesetter

7 files changed, 61 insertions, 33 deletions

diff --git a/src/app.c b/src/app.c
index 73d8f803..3bf9aec1 100644
--- a/src/app.c
+++ b/src/app.c
@@ -732,6 +732,7 @@ static void init_App_(iApp *d, int argc, char **argv) {
     setupApplication_iOS();
 #endif
     init_Keys();
+    setThemePalette_Color(d->prefs.theme); /* default UI colors */
     loadPrefs_App_(d);
     load_Keys(dataDir_App_());
     d->window = new_Window(d->initialWindowRect);
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 541489c1..9169ea06 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -571,10 +571,11 @@ static float normScrollPos_DocumentWidget_(const iDocumentWidget *d) {
 }
 
 static int scrollMax_DocumentWidget_(const iDocumentWidget *d) {
-    int sm = size_GmDocument(d->doc).y - height_Rect(bounds_Widget(constAs_Widget(d))) +
+    const iWidget *w = constAs_Widget(d);
+    int sm = size_GmDocument(d->doc).y - height_Rect(bounds_Widget(w)) +
              (hasSiteBanner_GmDocument(d->doc) ? 1 : 2) * d->pageMargin * gap_UI;
     if (d->phoneToolbar) {
-        sm += size_Root(constAs_Widget(d)->root).y -
+        sm += size_Root(w->root).y -
               top_Rect(boundsWithoutVisualOffset_Widget(d->phoneToolbar));
     }
     return sm;
@@ -3077,6 +3078,9 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                                   0,
                                   format_CStr("!open newtab:5 url:%s", cstr_String(linkUrl)) } },
                             4);
+                        if (deviceType_App() == phone_AppDeviceType) {
+                            removeN_Array(&items, size_Array(&items) - 2, iInvalidSize);
+                        }
                     }
                     else if (!willUseProxy_App(scheme)) {
                         pushBack_Array(
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index 05cd1cc3..0257eda0 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -1162,7 +1162,8 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
                 return iTrue;
             case SDLK_RETURN:
             case SDLK_KP_ENTER:
-                if (mods == KMOD_SHIFT || (~d->inFlags & isUrl_InputWidgetFlag &&
+                if (mods == KMOD_SHIFT || (d->maxLen == 0 &&
+                                           ~d->inFlags & isUrl_InputWidgetFlag &&
                                            deviceType_App() != desktop_AppDeviceType)) {
                     pushUndo_InputWidget_(d);
                     deleteMarked_InputWidget_(d);
diff --git a/src/ui/mobile.c b/src/ui/mobile.c
index 1f5e9758..6c3a0b32 100644
--- a/src/ui/mobile.c
+++ b/src/ui/mobile.c
@@ -253,7 +253,9 @@ static iAnyObject *addPanelChild_(iWidget *panel, iAnyObject *child, int64_t fla
             }
         }
         if ((elementType == toggle_PrefsElement && precedingElementType != toggle_PrefsElement) ||
-            (elementType == textInput_PrefsElement && precedingElementType != textInput_PrefsElement)) {
+            (elementType == textInput_PrefsElement && precedingElementType != textInput_PrefsElement) ||
+            (elementType == dropdown_PrefsElement && precedingElementType != dropdown_PrefsElement) ||
+            (elementType == radioButton_PrefsElement && precedingElementType == heading_PrefsElement)) {
             flags |= borderTop_WidgetFlag;
         }
         return addChildFlags_Widget(panel, child, flags);
@@ -305,6 +307,7 @@ static iWidget *makeValuePadding_(iWidget *value) {
 }
 
 static iWidget *makeValuePaddingWithHeading_(iLabelWidget *heading, iWidget *value) {
+    const iBool isInput = isInstance_Object(value, &Class_InputWidget);
     iWidget *div = new_Widget();
     setFlags_Widget(div,
                     borderBottom_WidgetFlag | arrangeHeight_WidgetFlag |
@@ -313,10 +316,11 @@ static iWidget *makeValuePaddingWithHeading_(iLabelWidget *heading, iWidget *val
     setBackgroundColor_Widget(div, uiBackgroundSidebar_ColorId);
     setPadding_Widget(div, gap_UI, gap_UI, 4 * gap_UI, gap_UI);
     addChildFlags_Widget(div, iClob(heading), 0);
+    setPadding1_Widget(as_Widget(heading), 0);
     //setFixedSize_Widget(as_Widget(heading), init_I2(-1, height_Widget(value)));
     setFont_LabelWidget(heading, labelFont_());
     setTextColor_LabelWidget(heading, uiTextStrong_ColorId);
-    if (isInstance_Object(value, &Class_InputWidget)) {
+    if (isInput) {
         addChildFlags_Widget(div, iClob(value), expand_WidgetFlag);
     }
     else if (isInstance_Object(value, &Class_LabelWidget) &&
@@ -332,6 +336,7 @@ static iWidget *makeValuePaddingWithHeading_(iLabelWidget *heading, iWidget *val
         addChildFlags_Widget(div, iClob(new_Widget()), expand_WidgetFlag);
         addChild_Widget(div, iClob(value));
     }
+    printTree_Widget(div);
     return div;
 }
 
@@ -374,7 +379,9 @@ void finalizeSheet_Mobile(iWidget *sheet) {
             postRefresh_App();
             return;
         }
-        /*       Landscape Layout                 Portrait Layout
+        /* TODO: In portrait, top panel and detail stack are all stacked together.
+         
+                 Landscape Layout                 Portrait Layout
                                               
         ┌─────────┬──────Detail─Stack─────┐    ┌─────────┬ ─ ─ ─ ─ ┐
         │         │┌───────────────────┐  │    │         │Detail
@@ -616,10 +623,9 @@ void finalizeSheet_Mobile(iWidget *sheet) {
             addChild_Widget(topPanel, iClob(makePadding_Widget(lineHeight_Text(labelFont_()))));
             iLabelWidget *aboutButton = addChildFlags_Widget(topPanel,
                                  iClob(makePanelButton_(planet_Icon " ${menu.about}", "panel.open")),
-                                 chevron_WidgetFlag);
+                                 chevron_WidgetFlag | borderTop_WidgetFlag);
             addChildFlags_Widget(topPanel,
-                                 iClob(makePanelButton_(info_Icon " ${menu.help}", "!open url:about:help")),
-                                 borderTop_WidgetFlag);
+                                 iClob(makePanelButton_(info_Icon " ${menu.help}", "!open url:about:help")), 0);
             /* The About panel. */ {
                 iWidget *panel = addChildPanel_(detailStack, aboutButton, NULL);
                 iString *msg = collectNew_String();
diff --git a/src/ui/root.c b/src/ui/root.c
index 8c98bdd3..9ed62711 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -776,17 +776,12 @@ static iBool handleSearchBarCommands_(iWidget *searchBar, const char *cmd) {
     else if (equal_Command(cmd, "focus.gained")) {
         if (pointer_Command(cmd) == findChild_Widget(searchBar, "find.input")) {
             if (!isVisible_Widget(searchBar)) {
-//                setFlags_Widget(searchBar, hidden_WidgetFlag | disabled_WidgetFlag, iFalse);
-//                arrange_Widget(root_Widget(searchBar));
-//                postRefresh_App();
                 showCollapsed_Widget(searchBar, iTrue);
             }
         }
     }
     else if (equal_Command(cmd, "find.close")) {
         if (isVisible_Widget(searchBar)) {
-            //setFlags_Widget(searchBar, hidden_WidgetFlag | disabled_WidgetFlag, iTrue);
-            //arrange_Widget(searchBar->parent);
             showCollapsed_Widget(searchBar, iFalse);
             if (isFocused_Widget(findChild_Widget(searchBar, "find.input"))) {
                 setFocus_Widget(NULL);
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 3439fb1b..43bbe56e 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -314,50 +314,48 @@ static void printf_Widget_(const iWidget *d, const char *format, ...) {
     delete_String(msg);
 }
 
-static void setWidth_Widget_(iWidget *d, int width) {
+static iBool setWidth_Widget_(iWidget *d, int width) {
     iAssert(width >= 0);
     TRACE(d, "attempt to set width to %d (current: %d, min width: %d)", width, d->rect.size.x, d->minSize.x);
     width = iMax(width, d->minSize.x);
-    if (~d->flags & fixedWidth_WidgetFlag) { //} || d->flags & collapse_WidgetFlag) {
+    if (~d->flags & fixedWidth_WidgetFlag) {
         if (d->rect.size.x != width) {
             d->rect.size.x = width;
             TRACE(d, "width has changed to %d", width);
             if (class_Widget(d)->sizeChanged) {
                 const int oldHeight = d->rect.size.y;
                 class_Widget(d)->sizeChanged(d);
-                if (d->rect.size.y != oldHeight) {
-                    TRACE(d, "sizeChanged() cuased height change to %d; redoing parent", d->rect.size.y);
-                    /* Widget updated its height. */
-                    arrange_Widget_(d->parent);
-                    TRACE(d, "parent layout redone");
-                }
             }
+            return iTrue;
         }
     }
     else {
         TRACE(d, "changing width not allowed; flags: %x", d->flags);
     }
+    return iFalse;
 }
 
-static void setHeight_Widget_(iWidget *d, int height) {
+static iBool setHeight_Widget_(iWidget *d, int height) {
     iAssert(height >= 0);
     if (d->sizeRef) {
         return; /* height defined by another widget */
     }
     TRACE(d, "attempt to set height to %d (current: %d, min height: %d)", height, d->rect.size.y, d->minSize.y);
     height = iMax(height, d->minSize.y);
-    if (~d->flags & fixedHeight_WidgetFlag) { //} || d->flags & collapse_WidgetFlag) {
+    if (~d->flags & fixedHeight_WidgetFlag) {
         if (d->rect.size.y != height) {
             d->rect.size.y = height;
             TRACE(d, "height has changed to %d", height);
             if (class_Widget(d)->sizeChanged) {
                 class_Widget(d)->sizeChanged(d);
             }
+            return iTrue;
         }
     }
     else {
         TRACE(d, "changing height not allowed; flags: %x", d->flags);
     }
+    return iFalse;
 }
 
 iLocalDef iRect innerRect_Widget_(const iWidget *d) {
@@ -578,6 +576,12 @@ static void arrange_Widget_(iWidget *d) {
             TRACE(d, "...done changing child sizes (EVEN mode)");
         }
     }
+    /* Children arrange themselves. */ {
+        iForEach(ObjectList, i, d->children) {
+            iWidget *child = as_Widget(i.object);
+            arrange_Widget_(child);
+        }
+    }
     /* Resize the expanding children to fill the remaining available space. */
     if (expCount > 0 && (d->flags & (arrangeHorizontal_WidgetFlag | arrangeVertical_WidgetFlag))) {
         TRACE(d, "%d expanding children, resizing them %s...", expCount,
@@ -600,16 +604,20 @@ static void arrange_Widget_(iWidget *d) {
                 TRACE(d, "child %p size is not arranged", child);
                 continue;
             }
+            iBool sizeChanged = iFalse;
             if (child->flags & expand_WidgetFlag) {
                 if (d->flags & arrangeHorizontal_WidgetFlag) {
-                    setWidth_Widget_(child, avail.x);
-                    setHeight_Widget_(child, height_Rect(innerRect));
+                    sizeChanged |= setWidth_Widget_(child, avail.x);
+                    sizeChanged |= setHeight_Widget_(child, height_Rect(innerRect));
                 }
                 else if (d->flags & arrangeVertical_WidgetFlag) {
-                    setWidth_Widget_(child, width_Rect(innerRect));
-                    setHeight_Widget_(child, avail.y);
+                    sizeChanged |= setWidth_Widget_(child, width_Rect(innerRect));
+                    sizeChanged |= setHeight_Widget_(child, avail.y);
                 }
             }
+            if (sizeChanged) {
+                arrange_Widget_(child); /* its children may need rearranging */
+            }
         }
     }
     if (d->flags & resizeChildrenToWidestChild_WidgetFlag) {
@@ -618,7 +626,9 @@ static void arrange_Widget_(iWidget *d) {
         iForEach(ObjectList, i, d->children) {
             iWidget *child = as_Widget(i.object);
             if (isArrangedSize_Widget_(child)) {
-                setWidth_Widget_(child, widest);
+                if (setWidth_Widget_(child, widest)) {
+                    arrange_Widget_(child); /* its children may need rearranging */
+                }
             }
             else {
                 TRACE(d, "child %p cannot be resized (parentCannotResize: %d)", child,
@@ -633,7 +643,6 @@ static void arrange_Widget_(iWidget *d) {
           d->flags & arrangeVertical_WidgetFlag ? " vert" : "");
     iForEach(ObjectList, i, d->children) {
         iWidget *child = as_Widget(i.object);
-        arrange_Widget_(child);
         if (isCollapsed_Widget_(child) || !isArrangedPos_Widget_(child)) {
             TRACE(d, "child %p arranging prohibited", child);
             continue;
@@ -726,13 +735,15 @@ static void resetArrangement_Widget_(iWidget *d) {
             if (d->flags & arrangeHorizontal_WidgetFlag) {
                 child->rect.pos.x = 0;
             }
-            if (d->flags & resizeWidthOfChildren_WidgetFlag && child->flags & expand_WidgetFlag) {
+            if (d->flags & resizeWidthOfChildren_WidgetFlag && child->flags & expand_WidgetFlag &&
+                ~child->flags & fixedWidth_WidgetFlag) {
                 child->rect.size.x = 0;
             }
             if (d->flags & arrangeVertical_WidgetFlag) {
                 child->rect.pos.y = 0;
             }
-            if (d->flags & resizeHeightOfChildren_WidgetFlag && child->flags & expand_WidgetFlag) {
+            if (d->flags & resizeHeightOfChildren_WidgetFlag && child->flags & expand_WidgetFlag &&
+                ~child->flags & fixedHeight_WidgetFlag) {
                 child->rect.size.y = 0;
             }
         }
@@ -741,6 +752,11 @@ static void resetArrangement_Widget_(iWidget *d) {
 
 void arrange_Widget(iWidget *d) {
     if (d) {
+#if !defined (NDEBUG)
+        if (tracing_) {
+            puts("\n==== NEW WIDGET ARRANGEMENT ====\n");
+        }
+#endif
         resetArrangement_Widget_(d); /* back to initial default sizes */
         arrange_Widget_(d);
     }
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);