Mobile: Dialog layout fixes

Orientation and safe inset changes are now applied to phone dialogs.

There is still the occasional unscrollable dialog, but it seems random?

5 files changed, 135 insertions, 38 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 6df25433..02358597 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1653,7 +1653,9 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         setSize_Widget(sizer, init_I2(gap_UI * 90, 1));
         addChildFlags_Widget(dlg, iClob(sizer), frameless_WidgetFlag);
         setFlags_Widget(dlg, centerHorizontal_WidgetFlag, iFalse);
-        setPos_Widget(dlg, bottomLeft_Rect(bounds_Widget(findWidget_App("navbar.lock"))));
+        if (deviceType_App() != phone_AppDeviceType) {
+            setPos_Widget(dlg, bottomLeft_Rect(bounds_Widget(findWidget_App("navbar.lock"))));
+        }
         arrange_Widget(dlg);
         addAction_Widget(dlg, SDLK_ESCAPE, 0, "message.ok");
         addAction_Widget(dlg, SDLK_SPACE, 0, "message.ok");
diff --git a/src/ui/util.c b/src/ui/util.c
index 18ed7ba2..c1e27751 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -403,6 +403,7 @@ static iBool isCommandIgnoredByMenus_(const char *cmd) {
            equal_Command(cmd, "document.changed") ||
            equal_Command(cmd, "visited.changed") ||
            (deviceType_App() == desktop_AppDeviceType && equal_Command(cmd, "window.resized")) ||
+           equal_Command(cmd, "widget.overflow") ||
            equal_Command(cmd, "window.reload.update") ||
            equal_Command(cmd, "window.mouse.exited") ||
            equal_Command(cmd, "window.mouse.entered") ||
@@ -909,6 +910,23 @@ iWidget *makeSheet_Widget(const char *id) {
     return sheet;
 }
 
+static void updateSheetPanelMetrics_(iWidget *sheet) {
+    iWidget *navi       = findChild_Widget(sheet, "panel.navi");
+    iWidget *naviPad    = child_Widget(navi, 0);
+    int      naviHeight = lineHeight_Text(defaultBig_FontId) + 4 * gap_UI;
+#if defined (iPlatformAppleMobile)
+    float left, right, top, bottom;
+    safeAreaInsets_iOS(&left, &top, &right, &bottom);
+    setPadding_Widget(sheet, left, 0, right, 0);
+    navi->rect.pos = init_I2(left, top);
+    iConstForEach(PtrArray, i, findChildren_Widget(sheet, "panel.toppad")) {
+        iWidget *pad = *i.value;
+        setSize_Widget(pad, init1_I2(naviHeight));
+    }
+#endif
+    setSize_Widget(navi, init_I2(-1, naviHeight));
+}
+
 static iBool slidePanelHandler_(iWidget *d, const char *cmd) {
     if (equal_Command(cmd, "panel.open")) {
         iWidget *button = pointer_Command(cmd);
@@ -944,19 +962,9 @@ static iBool slidePanelHandler_(iWidget *d, const char *cmd) {
         return iTrue;
     }
     if (equal_Command(cmd, "window.resized")) {
-        iWidget *sheet = parent_Widget(d);
-#if defined (iPlatformAppleMobile)
-        float left, top, right, bottom;
-        safeAreaInsets_iOS(&left, &top, &right, &bottom);
-        /* TODO: incorrect */
-        if (isLandscape_App()) {
-            setPadding_Widget(sheet, left, 0, right, 0);
-        }
-        else {
-            setPadding1_Widget(sheet, 0);
-        }
-#endif
-    }    return iFalse;
+        updateSheetPanelMetrics_(parent_Widget(d));
+    }
+    return iFalse;
 }
 
 static iBool isTwoColumnPage_(iWidget *d) {
@@ -1082,19 +1090,6 @@ void finalizeSheet_Widget(iWidget *sheet) {
            can be taller than the display. In hindsight, it may have been easier to
            create phone versions of each dialog, but at least this works with any future
            changes to the UI (..."works"). */
-        int topSafe = 0;
-        int navBarHeight = lineHeight_Text(defaultBig_FontId) + 4 * gap_UI;
-#if defined (iPlatformAppleMobile)
-        /* Safe area insets. */ {
-            /* TODO: Must be updated when orientation changes; use a widget flag? */
-            float l, t, r, b;
-            safeAreaInsets_iOS(&l, &t, &r, &b);
-//            setPadding_Widget(sheet, l, t, r, b);
-            setPadding1_Widget(sheet, 0);
-            topSafe = t;
-            navBarHeight += t;
-        }
-#endif
         setFlags_Widget(sheet,
                         keepOnTop_WidgetFlag |
                         parentCannotResize_WidgetFlag |
@@ -1110,6 +1105,7 @@ void finalizeSheet_Widget(iWidget *sheet) {
                         resizeWidthOfChildren_WidgetFlag,
                         iTrue);
         setBackgroundColor_Widget(sheet, uiBackground_ColorId);
+        setPadding1_Widget(sheet, 0);
         iPtrArray *contents = collect_PtrArray(new_PtrArray()); /* two-column pages */
         iPtrArray *panelButtons = collect_PtrArray(new_PtrArray());
         iWidget *tabs = findChild_Widget(sheet, "prefs.tabs");
@@ -1166,7 +1162,6 @@ void finalizeSheet_Widget(iWidget *sheet) {
             }
         }
         const iBool useSlidePanels = (size_PtrArray(contents) == size_PtrArray(panelButtons));
-        topPanel->rect.pos = init_I2(0, navBarHeight);
         addChildFlags_Widget(sheet, iClob(topPanel),
                              arrangeVertical_WidgetFlag |
                              resizeWidthOfChildren_WidgetFlag | arrangeHeight_WidgetFlag |
@@ -1182,7 +1177,7 @@ void finalizeSheet_Widget(iWidget *sheet) {
                 setId_Widget(owner, "panel");
                 setUserData_Object(button, owner);
                 setBackgroundColor_Widget(owner, uiBackground_ColorId);
-                addChild_Widget(owner, iClob(makePadding_Widget(navBarHeight - topSafe)));
+                setId_Widget(addChild_Widget(owner, iClob(makePadding_Widget(0))), "panel.toppad");
                 iLabelWidget *title = addChildFlags_Widget(owner,
                                                            iClob(new_LabelWidget(cstrCollect_String(upper_String(text_LabelWidget(button))), NULL)), alignLeft_WidgetFlag | frameless_WidgetFlag);
                 setFont_LabelWidget(title, uiLabelLargeBold_FontId);
@@ -1192,6 +1187,7 @@ void finalizeSheet_Widget(iWidget *sheet) {
                                      focusRoot_WidgetFlag |
                                      hidden_WidgetFlag |
                                      disabled_WidgetFlag |
+                                     //safePadding_WidgetFlag |
                                      arrangeVertical_WidgetFlag |
                                      resizeWidthOfChildren_WidgetFlag |
                                      arrangeHeight_WidgetFlag |
@@ -1337,6 +1333,7 @@ void finalizeSheet_Widget(iWidget *sheet) {
                                  chevron_WidgetFlag);
         }
         else {
+            setFlags_Widget(topPanel, overflowScrollable_WidgetFlag, iTrue);
             /* Update heading style. */
             setFont_LabelWidget((iLabelWidget *) dialogHeading, uiLabelLargeBold_FontId);
             setFlags_Widget(dialogHeading, alignLeft_WidgetFlag, iTrue);
@@ -1348,11 +1345,16 @@ void finalizeSheet_Widget(iWidget *sheet) {
             removeChild_Widget(parent_Widget(input), input);
             addChild_Widget(topPanel, iClob(makeValuePadding_(as_Widget(input))));
         }
+        /* Top padding for each panel, to account for the overlaid navbar. */ {
+            setId_Widget(addChildPos_Widget(topPanel,
+                                            iClob(makePadding_Widget(0)), front_WidgetAddPos),
+                         "panel.toppad");
+        }
         /* Navbar. */ {
             iWidget *navi = new_Widget();
-            setSize_Widget(navi, init_I2(-1, navBarHeight));
+            setId_Widget(navi, "panel.navi");
             setBackgroundColor_Widget(navi, uiBackground_ColorId);
-            addChild_Widget(navi, iClob(makePadding_Widget(topSafe)));
+            addChild_Widget(navi, iClob(makePadding_Widget(0)));
             iLabelWidget *back = addChildFlags_Widget(navi,
                                                       iClob(new_LabelWidget(leftAngle_Icon " Back", "panel.close")),
                                                       noBackground_WidgetFlag | frameless_WidgetFlag |
@@ -1361,6 +1363,7 @@ void finalizeSheet_Widget(iWidget *sheet) {
             setId_Widget(as_Widget(back), "panel.back");
             setFont_LabelWidget(back, defaultBig_FontId);
             if (!isPrefs) {
+                /* Pick up the dialog buttons for the navbar. */
                 iWidget *buttons = findChild_Widget(sheet, "dialogbuttons");
                 iLabelWidget *cancel = findMenuItem_Widget(buttons, "cancel");
                 if (cancel) {
@@ -1385,7 +1388,22 @@ void finalizeSheet_Widget(iWidget *sheet) {
                     addChildFlags_Widget(as_Widget(back), iClob(def), moveToParentRightEdge_WidgetFlag);
                     updateSize_LabelWidget(def);
                 }
-                /* TODO: Action buttons should be added in the bottom as extra buttons. */
+                /* Action buttons are added in the bottom as extra buttons. */ {
+                    iBool isFirstAction = iTrue;
+                    iForEach(ObjectList, i, children_Widget(buttons)) {
+                        if (isInstance_Object(i.object, &Class_LabelWidget) &&
+                            i.object != cancel && i.object != def) {
+                            iLabelWidget *item = i.object;
+                            setBackgroundColor_Widget(i.object, uiBackgroundSidebar_ColorId);
+                            setFont_LabelWidget(item, defaultBig_FontId);
+                            removeChild_Widget(buttons, item);
+                            addChildFlags_Widget(topPanel, iClob(item), panelButtonFlags |
+                                                 (isFirstAction ? borderTop_WidgetFlag : 0));
+                            updateSize_LabelWidget(item);
+                            isFirstAction = iFalse;
+                        }
+                    }
+                }
                 iRelease(removeChild_Widget(parent_Widget(buttons), buttons));
                 /* Styling for remaining elements. */
                 iForEach(ObjectList, i, children_Widget(topPanel)) {
@@ -1400,10 +1418,14 @@ void finalizeSheet_Widget(iWidget *sheet) {
                 }
             }
             addChildFlags_Widget(sheet, iClob(navi),
+                                 drawBackgroundToVerticalSafeArea_WidgetFlag |
                                  arrangeHeight_WidgetFlag | resizeWidthOfChildren_WidgetFlag |
                                  resizeToParentWidth_WidgetFlag | arrangeVertical_WidgetFlag);
         }
+        updateSheetPanelMetrics_(sheet);
         arrange_Widget(sheet->parent);
+        postCommand_App("widget.overflow"); /* with the correct dimensions */
+//        printTree_Widget(sheet);
     }
     else {
         arrange_Widget(sheet);
@@ -1613,6 +1635,7 @@ static iBool messageHandler_(iWidget *msg, const char *cmd) {
           equal_Command(cmd, "document.autoreload") ||
           equal_Command(cmd, "document.reload") ||
           equal_Command(cmd, "document.request.updated") ||
+          equal_Command(cmd, "widget.overflow") ||
           startsWith_CStr(cmd, "window."))) {
         destroy_Widget(msg);
     }
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 8641dd61..385eb7e0 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -102,7 +102,7 @@ static void visualOffsetAnimation_Widget_(void *ptr) {
         addTicker_App(visualOffsetAnimation_Widget_, ptr);
     }
     else {
-        setFlags_Widget(d, visualOffset_WidgetFlag, iFalse);
+        d->flags &= ~visualOffset_WidgetFlag;
     }
 }
 
@@ -341,7 +341,7 @@ void arrange_Widget(iWidget *d) {
         return;
     }
     if (d->flags & moveToParentLeftEdge_WidgetFlag) {
-        d->rect.pos.x = d->padding[0];
+        d->rect.pos.x = d->padding[0]; /* FIXME: Shouldn't this be d->parent->padding[0]? */
     }
     else if (d->flags & moveToParentRightEdge_WidgetFlag) {
         d->rect.pos.x = width_Rect(innerRect_Widget_(d->parent)) - width_Rect(d->rect);
@@ -355,6 +355,13 @@ void arrange_Widget(iWidget *d) {
     if (d->flags & resizeToParentHeight_WidgetFlag) {
         setHeight_Widget_(d, height_Rect(innerRect_Widget_(d->parent)));
     }
+    if (d->flags & safePadding_WidgetFlag) {
+#if defined (iPlatformAppleMobile)
+        float left, top, right, bottom;
+        safeAreaInsets_iOS(&left, &top, &right, &bottom);
+        setPadding_Widget(d, left, top, right, bottom);
+#endif
+    }
     /* The rest of the arrangement depends on child widgets. */
     if (!d->children) {
         return;
@@ -489,6 +496,9 @@ void arrange_Widget(iWidget *d) {
         else if ((d->flags & resizeChildren_WidgetFlag) == resizeChildren_WidgetFlag) {
             child->rect.pos = pos;
         }
+        else if (d->flags & resizeWidthOfChildren_WidgetFlag) {
+            child->rect.pos.x = pos.x;
+        }
     }
     /* Update the size of the widget according to the arrangement. */
     if (d->flags & arrangeSize_WidgetFlag) {
@@ -667,10 +677,10 @@ iBool dispatchEvent_Widget(iWidget *d, const SDL_Event *ev) {
                 }
 #endif
 #if 0
-                if (ev->type == SDL_MOUSEBUTTONDOWN) {
-                    printf("[%p] %s:'%s' ate the button %d\n",
+                if (ev->type == SDL_MOUSEWHEEL) {
+                    printf("[%p] %s:'%s' ate the wheel\n",
                            child, class_Widget(child)->name,
-                           cstr_String(id_Widget(child)), ev->button.button);
+                           cstr_String(id_Widget(child)));
                     fflush(stdout);
                 }
 #endif
@@ -692,6 +702,36 @@ iBool dispatchEvent_Widget(iWidget *d, const SDL_Event *ev) {
     return iFalse;
 }
 
+static iBool scrollOverflow_Widget_(iWidget *d, int delta) {
+    iRect bounds = bounds_Widget(d);
+    const iInt2 rootSize = rootSize_Window(get_Window());
+    const iRect winRect = safeRootRect_Window(get_Window());
+    const int yTop = top_Rect(winRect);
+    const int yBottom = bottom_Rect(winRect);
+    //const int safeBottom = rootSize.y - yBottom;
+    bounds.pos.y += delta;
+    const iRangei range = { bottom_Rect(winRect) - height_Rect(bounds), yTop };
+//    printf("range: %d ... %d\n", range.start, range.end);
+    if (range.start >= range.end) {
+        bounds.pos.y = range.end;
+    }
+    else {
+        bounds.pos.y = iClamp(bounds.pos.y, range.start, range.end);
+    }
+//    if (delta >= 0) {
+//        bounds.pos.y = iMin(bounds.pos.y, yTop);
+//    }
+//    else {
+//        bounds.pos.y = iMax(bounds.pos.y, );
+//    }
+    const iInt2 newPos = localCoord_Widget(d->parent, bounds.pos);
+    if (!isEqual_I2(newPos, d->rect.pos)) {
+        d->rect.pos = newPos;
+        refresh_Widget(d);
+    }
+    return height_Rect(bounds) > height_Rect(winRect);
+}
+
 iBool processEvent_Widget(iWidget *d, const SDL_Event *ev) {
     if (ev->type == SDL_KEYDOWN) {
         if (ev->key.keysym.sym == SDLK_TAB) {
@@ -720,6 +760,14 @@ iBool processEvent_Widget(iWidget *d, const SDL_Event *ev) {
     }
     else if (d->flags & overflowScrollable_WidgetFlag && ev->type == SDL_MOUSEWHEEL &&
              ~d->flags & visualOffset_WidgetFlag) {
+        int step = ev->wheel.y;
+        if (!isPerPixel_MouseWheelEvent(&ev->wheel)) {
+            step *= lineHeight_Text(uiLabel_FontId);
+        }
+        if (scrollOverflow_Widget_(d, step)) {
+            return iTrue;
+        }
+#if 0
         iRect bounds = bounds_Widget(d);
         const iInt2 rootSize = rootSize_Window(get_Window());
         const iRect winRect = safeRootRect_Window(get_Window());
@@ -736,15 +784,20 @@ iBool processEvent_Widget(iWidget *d, const SDL_Event *ev) {
                 bounds.pos.y = iMin(bounds.pos.y, yTop);
             }
             else {
-                bounds.pos.y = iMax(bounds.pos.y, rootSize.y + safeBottom - height_Rect(bounds));
+                bounds.pos.y = iMax(bounds.pos.y, rootSize.y /*+ safeBottom*/ - height_Rect(bounds));
             }
             d->rect.pos = localCoord_Widget(d->parent, bounds.pos);
             refresh_Widget(d);
             return iTrue;
         }
+#endif
     }
     switch (ev->type) {
         case SDL_USEREVENT: {
+            if (d->flags & overflowScrollable_WidgetFlag &&
+                isCommand_UserEvent(ev, "widget.overflow")) {
+                scrollOverflow_Widget_(d, 0); /* check bounds */
+            }
             if (ev->user.code == command_UserEventCode && d->commandHandler &&
                 d->commandHandler(d, ev->user.data1)) {
                 return iTrue;
@@ -1041,6 +1094,21 @@ iAny *findChild_Widget(const iWidget *d, const char *id) {
     return NULL;
 }
 
+static void addMatchingToArray_Widget_(const iWidget *d, const char *id, iPtrArray *found) {
+    if (cmp_String(id_Widget(d), id) == 0) {
+        pushBack_PtrArray(found, d);
+    }
+    iForEach(ObjectList, i, d->children) {
+        addMatchingToArray_Widget_(i.object, id, found);
+    }
+}
+
+const iPtrArray *findChildren_Widget(const iWidget *d, const char *id) {
+    iPtrArray *found = new_PtrArray();
+    addMatchingToArray_Widget_(d, id, found);
+    return collect_PtrArray(found);
+}
+
 iAny *findParentClass_Widget(const iWidget *d, const iAnyClass *class) {
     if (!d) return NULL;
     iWidget *i = d->parent;
diff --git a/src/ui/widget.h b/src/ui/widget.h
index 8dc51a1f..88d75b62 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -29,6 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #include <the_Foundation/object.h>
 #include <the_Foundation/objectlist.h>
+#include <the_Foundation/ptrarray.h>
 #include <the_Foundation/rect.h>
 #include <the_Foundation/string.h>
 #include <SDL_events.h>
@@ -108,6 +109,7 @@ enum iWidgetFlag {
 #define drawBackgroundToBottom_WidgetFlag   iBit64(53)
 #define dragged_WidgetFlag                  iBit64(54)
 #define hittable_WidgetFlag                 iBit64(55)
+#define safePadding_WidgetFlag              iBit64(56) /* padded using safe area insets */
 
 enum iWidgetAddPos {
     back_WidgetAddPos,
@@ -167,6 +169,7 @@ iInt2   localCoord_Widget   (const iWidget *, iInt2 coord);
 iBool   contains_Widget     (const iWidget *, iInt2 coord);
 iAny *  hitChild_Widget     (const iWidget *, iInt2 coord);
 iAny *  findChild_Widget    (const iWidget *, const char *id);
+const iPtrArray *findChildren_Widget  (const iWidget *, const char *id);
 iAny *  findParentClass_Widget(const iWidget *, const iAnyClass *class);
 iAny *  findFocusable_Widget(const iWidget *startFrom, enum iWidgetFocusDir focusDir);
 size_t  childCount_Widget   (const iWidget *);
diff --git a/src/ui/window.c b/src/ui/window.c
index 2ef67142..6e81c14c 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -1210,6 +1210,7 @@ static void updateRootSize_Window_(iWindow *d, iBool notifyAlways) {
                          size->y,
                          isHoriz,
                          isVert);
+        postCommand_App("widget.overflow"); /* check bounds with updated sizes */
         postRefresh_App();
         d->place.lastNotifiedSize = *size;
     }