UI root sizing is independent of window sizing

12 files changed, 73 insertions, 81 deletions

diff --git a/src/app.c b/src/app.c
index 675edf4c..9ef49f4f 100644
--- a/src/app.c
+++ b/src/app.c
@@ -1293,7 +1293,7 @@ iPeriodic *periodic_App(void) {
 }
 
 iBool isLandscape_App(void) {
-    const iInt2 size = rootSize_Window(get_Window());
+    const iInt2 size = size_Window(get_Window());
     return size.x > size.y;
 }
 
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index ee44933e..e09844c2 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -567,7 +567,7 @@ static int scrollMax_DocumentWidget_(const iDocumentWidget *d) {
     int sm = size_GmDocument(d->doc).y - height_Rect(bounds_Widget(constAs_Widget(d))) +
              (hasSiteBanner_GmDocument(d->doc) ? 1 : 2) * d->pageMargin * gap_UI;
     if (d->phoneToolbar) {
-        sm += rootSize_Window(get_Window()).y -
+        sm += size_Root(get_Root()).y -
               top_Rect(boundsWithoutVisualOffset_Widget(d->phoneToolbar));
     }
     return sm;
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index df5eb0df..52cb9805 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -338,7 +338,7 @@ void setText_InputWidget(iInputWidget *d, const iString *text) {
             text = enc;
         }
         /* Omit the default (Gemini) scheme if there isn't much space. */
-        if (isNarrow_Window(get_Window())) { // flags_Widget(as_Widget(d)) & tight_WidgetFlag) {
+        if (isNarrow_Root(get_Root())) { // flags_Widget(as_Widget(d)) & tight_WidgetFlag) {
             text = omitDefaultScheme_(collect_String(copy_String(text)));
         }
     }
@@ -733,7 +733,7 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
         if (isFocused_Widget(d) && arg_Command(command_UserEvent(ev))) {
             iRect rect = bounds_Widget(w);
             rect.pos.y -= value_Anim(&get_Window()->rootOffset);
-            const iInt2 visRoot = visibleRootSize_Window(get_Window());
+            const iInt2 visRoot = visibleSize_Root(get_Root());
             if (bottom_Rect(rect) > visRoot.y) {
                 setValue_Anim(&get_Window()->rootOffset, -(bottom_Rect(rect) - visRoot.y), 250);
             }
diff --git a/src/ui/lookupwidget.c b/src/ui/lookupwidget.c
index f3fd54d2..7c3ebce2 100644
--- a/src/ui/lookupwidget.c
+++ b/src/ui/lookupwidget.c
@@ -654,8 +654,7 @@ static iBool processEvent_LookupWidget_(iLookupWidget *d, const SDL_Event *ev) {
              (equal_Command(cmd, "layout.changed") &&
               equal_Rangecc(range_Command(cmd, "id"), "navbar"))) {
         /* Position the lookup popup under the URL bar. */ {
-            const iWindow *window = get_Window();
-            const iInt2 rootSize = rootSize_Window(window);
+            const iInt2 rootSize = size_Root(get_Root());
             const iRect navBarBounds = bounds_Widget(findWidget_App("navbar"));
             setFixedSize_Widget(w, init_I2(width_Widget(findWidget_App("url")),
                                            (rootSize.y - bottom_Rect(navBarBounds)) / 2));
diff --git a/src/ui/root.c b/src/ui/root.c
index bd7d07a1..375107c9 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -522,14 +522,14 @@ static int navBarAvailableSpace_(iWidget *navBar) {
     return avail;
 }
 
-iBool isNarrow_Window(const iWindow *d) {
-    return width_Rect(safeRootRect_Window(d)) / gap_UI < 140;
+iBool isNarrow_Root(const iRoot *d) {
+    return width_Rect(safeRect_Root(d)) / gap_UI < 140;
 }
 
 static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
     if (equal_Command(cmd, "window.resized") || equal_Command(cmd, "metrics.changed")) {
         const iBool isPhone = deviceType_App() == phone_AppDeviceType;
-        const iBool isNarrow = !isPhone && isNarrow_Window(get_Window());
+        const iBool isNarrow = !isPhone && isNarrow_Root(get_Root());
         /* Adjust navbar padding. */ {
             int hPad = isPhone && isPortrait_App() ? 0 : (isPhone || isNarrow) ? gap_UI / 2
                                                                                  : gap_UI * 3 / 2;
@@ -769,7 +769,7 @@ static iBool handleToolBarCommands_(iWidget *toolBar, const char *cmd) {
         //        setFlags_Widget(findChild_Widget(toolBar, "toolbar.view"), noBackground_WidgetFlag,
         //                        isVisible);
         /* If a sidebar hasn't been shown yet, it's height is zero. */
-        const int viewHeight = rootSize_Window(get_Window()).y;
+        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) {
@@ -798,14 +798,14 @@ static iBool handleToolBarCommands_(iWidget *toolBar, const char *cmd) {
         //        setFlags_Widget(findChild_Widget(toolBar, "toolbar.ident"), noBackground_WidgetFlag,
         //                        isVisible);
         /* If a sidebar hasn't been shown yet, it's height is zero. */
-        const int viewHeight = rootSize_Window(get_Window()).y;
+        const int viewHeight = size_Root(get_Root()).y;
         if (isVisible) {
             dismissSidebar_(sidebar2, NULL);
         }
         else {
             postCommand_App("sidebar2.mode arg:3 show:1");
             int offset = height_Widget(sidebar2);
-            if (offset == 0) offset = rootSize_Window(get_Window()).y;
+            if (offset == 0) offset = size_Root(get_Root()).y;
             setVisualOffset_Widget(sidebar2, offset, 0, 0);
             setVisualOffset_Widget(sidebar2, 0, 400, easeOut_AnimFlag | softer_AnimFlag);
         }
@@ -1240,7 +1240,7 @@ void showToolbars_Root(iRoot *d, iBool show) {
     if (isLandscape_App()) return;
     iWidget *toolBar = findChild_Widget(d->widget, "toolbar");
     if (!toolBar) return;
-    const int height = rootSize_Window(get_Window()).y - top_Rect(boundsWithoutVisualOffset_Widget(toolBar));
+    const int height = size_Root(d).y - top_Rect(boundsWithoutVisualOffset_Widget(toolBar));
     if (show && !isVisible_Widget(toolBar)) {
         setFlags_Widget(toolBar, hidden_WidgetFlag, iFalse);
         setVisualOffset_Widget(toolBar, 0, 200, easeOut_AnimFlag);
@@ -1254,3 +1254,27 @@ void showToolbars_Root(iRoot *d, iBool show) {
     }
 }
 
+iInt2 size_Root(const iRoot *d) {
+    return d && d->widget ? d->widget->rect.size : zero_I2();
+}
+
+iRect rect_Root(const iRoot *d) {
+    if (d && d->widget) {
+        return d->widget->rect;
+    }
+    return zero_Rect();    
+}
+
+iRect safeRect_Root(const iRoot *d) {
+    iRect rect = { zero_I2(), size_Root(d) };
+#if defined (iPlatformAppleMobile)
+    float left, top, right, bottom;
+    safeAreaInsets_iOS(&left, &top, &right, &bottom);
+    adjustEdges_Rect(&rect, top, -right, -bottom, left);
+#endif
+    return rect;
+}
+
+iInt2 visibleSize_Root(const iRoot *d) {
+    return addY_I2(size_Root(d), -get_Window()->keyboardHeight);
+}
diff --git a/src/ui/root.h b/src/ui/root.h
index 4b14b942..65da8d85 100644
--- a/src/ui/root.h
+++ b/src/ui/root.h
@@ -2,6 +2,7 @@
 
 #include "widget.h"
 #include <the_Foundation/ptrset.h>
+#include <the_Foundation/vec2.h>
 
 iDeclareType(Root)
     
@@ -30,3 +31,9 @@ void        updateMetrics_Root                  (iRoot *);
 void        updatePadding_Root                  (iRoot *); /* TODO: is part of metrics? */
 void        dismissPortraitPhoneSidebars_Root   (iRoot *);
 void        showToolbars_Root                   (iRoot *, iBool show);
+
+iInt2       size_Root                           (const iRoot *);
+iRect       rect_Root                           (const iRoot *);
+iRect       safeRect_Root                       (const iRoot *);
+iInt2       visibleSize_Root                    (const iRoot *); /* may be obstructed by software keyboard */
+iBool       isNarrow_Root                       (const iRoot *);
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 8d83eed6..f31dd195 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -792,7 +792,7 @@ void setWidth_SidebarWidget(iSidebarWidget *d, float widthAsGaps) {
         /* Even less space if the other sidebar is visible, too. */
         const int otherWidth =
             width_Widget(findWidget_App(d->side == left_SideBarSide ? "sidebar2" : "sidebar"));
-        width = iClamp(width, 30 * gap_UI, rootSize_Window(get_Window()).x - 50 * gap_UI - otherWidth);
+        width = iClamp(width, 30 * gap_UI, size_Root(get_Root()).x - 50 * gap_UI - otherWidth);
     }
     d->widthAsGaps = (float) width / (float) gap_UI;
     if (isVisible_Widget(w)) {
@@ -967,7 +967,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                     d,
                     ((d->side == left_SideBarSide
                          ? local.x
-                         : (rootSize_Window(get_Window()).x - coord_Command(cmd).x)) +
+                         : (size_Root(get_Root()).x - coord_Command(cmd).x)) +
                      resMid) / (float) gap_UI);
             }
             return iTrue;
diff --git a/src/ui/touch.c b/src/ui/touch.c
index 75bbf765..6867a34b 100644
--- a/src/ui/touch.c
+++ b/src/ui/touch.c
@@ -335,7 +335,7 @@ static void update_TouchState_(void *ptr) {
 }
 
 static iWidget *findOverflowScrollable_Widget_(iWidget *d) {
-    const iInt2 rootSize = rootSize_Window(get_Window());
+    const iInt2 rootSize = size_Root(get_Root());
     for (iWidget *w = d; w; w = parent_Widget(w)) {
         if (flags_Widget(w) & overflowScrollable_WidgetFlag) {
             if (height_Widget(w) > rootSize.y && !hasVisibleChildOnTop_Widget(w)) {
@@ -437,11 +437,11 @@ iBool processEvent_Touch(const SDL_Event *ev) {
         return iFalse;
     }
     iTouchState *d = touchState_();
-    iWindow *window = get_Window();
+    iWindow *window = get_Window();    
     if (!isFinished_Anim(&window->rootOffset)) {
         return iFalse;
     }
-    const iInt2 rootSize = rootSize_Window(window);
+    const iInt2 rootSize = size_Root(get_Root());
     const SDL_TouchFingerEvent *fing = &ev->tfinger;
     const iFloat3 pos = add_F3(init_F3(fing->x * rootSize.x, fing->y * rootSize.y, 0), /* pixels */
                                init_F3(0, -value_Anim(&window->rootOffset), 0));
diff --git a/src/ui/util.c b/src/ui/util.c
index 6b9a43d9..2a72d511 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -738,7 +738,7 @@ void openMenu_Widget(iWidget *d, iInt2 coord) {
 }
 
 void openMenuFlags_Widget(iWidget *d, iInt2 coord, iBool postCommands) {
-    const iInt2 rootSize        = rootSize_Window(get_Window());
+    const iInt2 rootSize        = size_Window(get_Window());
     const iBool isPortraitPhone = (deviceType_App() == phone_AppDeviceType && isPortrait_App());
     const iBool isSlidePanel    = (flags_Widget(d) & horizontalOffset_WidgetFlag) != 0;
     if (postCommands) {
@@ -756,7 +756,7 @@ void openMenuFlags_Widget(iWidget *d, iInt2 coord, iBool postCommands) {
         if (!isSlidePanel) {
             setFlags_Widget(d, borderTop_WidgetFlag, iTrue);
         }
-        d->rect.size.x = rootSize_Window(get_Window()).x;
+        d->rect.size.x = size_Window(get_Window()).x;
     }
     /* Update item fonts. */ {
         iForEach(ObjectList, i, children_Widget(d)) {
@@ -1754,7 +1754,7 @@ static void acceptValueInput_(iWidget *dlg) {
 }
 
 static void updateValueInputWidth_(iWidget *dlg) {
-    const iRect safeRoot = safeRootRect_Window(get_Window());
+    const iRect safeRoot = safeRect_Root(get_Root());
     const iInt2 rootSize = safeRoot.size;
     iWidget *   title    = findChild_Widget(dlg, "valueinput.title");
     iWidget *   prompt   = findChild_Widget(dlg, "valueinput.prompt");
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 47522dbe..2d9bf45d 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -352,7 +352,7 @@ static size_t numArrangedChildren_Widget_(const iWidget *d) {
 
 static void centerHorizontal_Widget_(iWidget *d) {
     d->rect.pos.x = ((d->parent ? width_Rect(innerRect_Widget_(d->parent))
-                                : rootSize_Window(get_Window()).x) -
+                                : size_Root(get_Root()).x) -
                      width_Rect(d->rect)) /
                     2;
     TRACE(d, "center horizontally: %d", d->rect.pos.x);
@@ -706,7 +706,7 @@ iBool containsExpanded_Widget(const iWidget *d, iInt2 coord, int expand) {
     const iRect bounds = {
         zero_I2(),
         addY_I2(d->rect.size,
-                d->flags & drawBackgroundToBottom_WidgetFlag ? rootSize_Window(get_Window()).y : 0)
+                d->flags & drawBackgroundToBottom_WidgetFlag ? size_Root(get_Root()).y : 0)
     };
     return contains_Rect(expand ? expanded_Rect(bounds, init1_I2(expand)) : bounds,
                          localCoord_Widget(d, coord));
@@ -845,8 +845,8 @@ iBool dispatchEvent_Widget(iWidget *d, const SDL_Event *ev) {
 
 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 iInt2 rootSize = size_Root(get_Root());
+    const iRect winRect = safeRect_Root(get_Root());
     const int yTop = top_Rect(winRect);
     const int yBottom = bottom_Rect(winRect);
     //const int safeBottom = rootSize.y - yBottom;
@@ -899,30 +899,6 @@ iBool processEvent_Widget(iWidget *d, const SDL_Event *ev) {
         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());
-        const int yTop = top_Rect(winRect);
-        const int yBottom = bottom_Rect(winRect);
-        const int safeBottom = rootSize.y - yBottom;
-        if (height_Rect(bounds) > height_Rect(winRect)) {
-            int step = ev->wheel.y;
-            if (!isPerPixel_MouseWheelEvent(&ev->wheel)) {
-                step *= lineHeight_Text(uiLabel_FontId);
-            }
-            bounds.pos.y += step;
-            if (step > 0) {
-                bounds.pos.y = iMin(bounds.pos.y, yTop);
-            }
-            else {
-                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: {
@@ -1003,14 +979,14 @@ void drawBackground_Widget(const iWidget *d) {
                 break;
         }
         fillRect_Paint(&p,
-                       initCorners_Rect(zero_I2(), rootSize_Window(get_Window())),
+                       rect_Root(get_Root()),
                        fadeColor);
         SDL_SetRenderDrawBlendMode(renderer_Window(get_Window()), SDL_BLENDMODE_NONE);
     }
     if (d->bgColor >= 0 || d->frameColor >= 0) {
         iRect rect = bounds_Widget(d);
         if (d->flags & drawBackgroundToBottom_WidgetFlag) {
-            rect.size.y = rootSize_Window(get_Window()).y - top_Rect(rect);
+            rect.size.y = size_Root(get_Root()).y - top_Rect(rect);
         }
         iPaint p;
         init_Paint(&p);
@@ -1018,7 +994,7 @@ void drawBackground_Widget(const iWidget *d) {
 #if defined (iPlatformAppleMobile)
             if (d->flags & (drawBackgroundToHorizontalSafeArea_WidgetFlag |
                             drawBackgroundToVerticalSafeArea_WidgetFlag)) {
-                const iInt2 rootSize = rootSize_Window(get_Window());
+                const iInt2 rootSize = size_Root(get_Root());
                 const iInt2 center = divi_I2(rootSize, 2);
                 int top = 0, right = 0, bottom = 0, left = 0;
                 if (d->flags & drawBackgroundToHorizontalSafeArea_WidgetFlag) {
diff --git a/src/ui/window.c b/src/ui/window.c
index 1e98b167..5c10fea6 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -170,12 +170,13 @@ static void setupUserInterface_Window(iWindow *d) {
     setCurrent_Root(NULL);
 }
 
-static void updateRootSize_Window_(iWindow *d, iBool notifyAlways) {
-    iInt2 *size = &d->root.widget->rect.size;
+static void updateSize_Window_(iWindow *d, iBool notifyAlways) {
+    iInt2 *size = &d->size;
     const iInt2 oldSize = *size;
     SDL_GetRendererOutputSize(d->render, &size->x, &size->y);
     size->y -= d->keyboardHeight;
-    d->root.widget->minSize = *size;
+    d->root.widget->rect.size = *size; /* Reposition roots. */
+    d->root.widget->minSize   = *size;
     if (notifyAlways || !isEqual_I2(oldSize, *size)) {
         updatePadding_Root(&d->root);
         const iBool isHoriz = (d->place.lastNotifiedSize.x != size->x);
@@ -346,6 +347,7 @@ static SDL_Surface *loadImage_(const iBlock *data, int resized) {
 void init_Window(iWindow *d, iRect rect) {
     theWindow_ = d;
     d->win = NULL;
+    d->size = zero_I2(); /* will be updated below */
     init_Root(&d->root);
     iZap(d->cursors);
     d->place.initialPos = rect.pos;
@@ -426,7 +428,7 @@ void init_Window(iWindow *d, iRect rect) {
     init_Text(d->render);
     setupUserInterface_Window(d);
     postCommand_App("~bindings.changed"); /* update from bindings */
-    updateRootSize_Window_(d, iFalse);
+    updateSize_Window_(d, iFalse);
     /* Load the border shadow texture. */ {
         SDL_Surface *surf = loadImage_(&imageShadow_Embedded, 0);
         d->borderShadow = SDL_CreateTextureFromSurface(d->render, surf);
@@ -639,7 +641,7 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
         case SDL_WINDOWEVENT_RESIZED:
             updatePadding_Root(&d->root);
             if (d->isMinimized) {
-                updateRootSize_Window_(d, iTrue);
+                updateSize_Window_(d, iTrue);
                 return iTrue;
             }
             if (unsnap_Window_(d, NULL)) {
@@ -650,11 +652,11 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
                 //printf("normal rect set (resize)\n"); fflush(stdout);
             }
             checkPixelRatioChange_Window_(d);
-            updateRootSize_Window_(d, iTrue /* we were already redrawing during the resize */);
+            updateSize_Window_(d, iTrue /* we were already redrawing during the resize */);
             postRefresh_App();
             return iTrue;
         case SDL_WINDOWEVENT_RESTORED:
-            updateRootSize_Window_(d, iTrue);
+            updateSize_Window_(d, iTrue);
             invalidate_Window_(d);
             d->isMinimized = iFalse;
             postRefresh_App();
@@ -847,7 +849,7 @@ void draw_Window(iWindow *d) {
         iInt2 renderSize;
         SDL_GetRendererOutputSize(d->render, &renderSize.x, &renderSize.y);
         if (!isEqual_I2(renderSize, d->root->rect.size)) {
-            updateRootSize_Window_(d, iTrue);
+            updateSize_Window_(d, iTrue);
             processEvents_App(postedEventsOnly_AppEventMode);
         }
     }
@@ -905,7 +907,7 @@ void draw_Window(iWindow *d) {
 
 void resize_Window(iWindow *d, int w, int h) {
     SDL_SetWindowSize(d->win, w, h);
-    updateRootSize_Window_(d, iFalse);
+    updateSize_Window_(d, iFalse);
 }
 
 void setTitle_Window(iWindow *d, const iString *title) {
@@ -944,22 +946,8 @@ uint32_t id_Window(const iWindow *d) {
     return d && d->win ? SDL_GetWindowID(d->win) : 0;
 }
 
-iInt2 rootSize_Window(const iWindow *d) {
-    return d && d->root.widget ? d->root.widget->rect.size : zero_I2();
-}
-
-iRect safeRootRect_Window(const iWindow *d) {
-    iRect rect = { zero_I2(), rootSize_Window(d) };
-#if defined (iPlatformAppleMobile)
-    float left, top, right, bottom;
-    safeAreaInsets_iOS(&left, &top, &right, &bottom);
-    adjustEdges_Rect(&rect, top, -right, -bottom, left);
-#endif
-    return rect;
-}
-
-iInt2 visibleRootSize_Window(const iWindow *d) {
-    return addY_I2(rootSize_Window(d), -d->keyboardHeight);
+iInt2 size_Window(const iWindow *d) {
+    return d ? d->size : zero_I2();
 }
 
 iInt2 coord_Window(const iWindow *d, int x, int y) {
diff --git a/src/ui/window.h b/src/ui/window.h
index f90bd863..a95d9f40 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -66,6 +66,7 @@ struct Impl_Window {
     iBool         ignoreClick;
     uint32_t      focusGainedAt;
     SDL_Renderer *render;
+    iInt2         size;
     iRoot         root;         /* root widget and UI state */
     float         pixelRatio;   /* conversion between points and pixels, e.g., coords, window size */
     float         displayScale; /* DPI-based scaling factor of current display, affects uiScale only */
@@ -95,9 +96,7 @@ void        showToolbars_Window     (iWindow *, iBool show);
 iBool       postContextClick_Window (iWindow *, const SDL_MouseButtonEvent *);
 
 uint32_t    id_Window               (const iWindow *);
-iInt2       rootSize_Window         (const iWindow *);
-iRect       safeRootRect_Window     (const iWindow *);
-iInt2       visibleRootSize_Window  (const iWindow *); /* may be obstructed by software keyboard */
+iInt2       size_Window             (const iWindow *);
 iInt2       maxTextureSize_Window   (const iWindow *);
 float       uiScale_Window          (const iWindow *);
 iInt2       coord_Window            (const iWindow *, int x, int y);
@@ -106,7 +105,6 @@ uint32_t    frameTime_Window        (const iWindow *);
 SDL_Renderer *renderer_Window       (const iWindow *);
 int         snap_Window             (const iWindow *);
 iBool       isFullscreen_Window     (const iWindow *);
-iBool       isNarrow_Window         (const iWindow *);
 
 iWindow *   get_Window              (void);