Keep labels aligned with expanding inputs

A widget may copy its height from another widget.

3 files changed, 16 insertions, 2 deletions

diff --git a/src/ui/util.c b/src/ui/util.c
index ece527e1..04cdf27f 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -2198,6 +2198,10 @@ static void addDialogInputWithHeading_(iWidget *headings, iWidget *values, const
     setPadding_Widget(as_Widget(head), 0, gap_UI, 0, 0);
 #endif
     setId_Widget(addChild_Widget(values, input), inputId);
+    if (deviceType_App() != phone_AppDeviceType) {
+        /* Ensure that the label has the same height as the input widget. */
+        as_Widget(head)->sizeRef = as_Widget(input);
+    }
 }
 
 iInputWidget *addTwoColumnDialogInputField_Widget(iWidget *headings, iWidget *values,
@@ -2225,8 +2229,9 @@ iWidget *makePreferences_Widget(void) {
     /* General preferences. */ {
         appendTwoColumnPage_(tabs, "${heading.prefs.general}", '1', &headings, &values);
 #if defined (LAGRANGE_ENABLE_DOWNLOAD_EDIT)
-        addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.downloads}")));
-        setId_Widget(addChild_Widget(values, iClob(new_InputWidget(0))), "prefs.downloads");
+        //addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.downloads}")));
+        //setId_Widget(addChild_Widget(values, iClob(new_InputWidget(0))), "prefs.downloads");
+        addPrefsInputWithHeading_(headings, values, "prefs.downloads", iClob(new_InputWidget(0)));
 #endif
         iInputWidget *searchUrl;
         addPrefsInputWithHeading_(headings, values, "prefs.searchurl", iClob(searchUrl = new_InputWidget(0)));
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 6412481b..c1c920d2 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -54,6 +54,7 @@ void init_Widget(iWidget *d) {
     d->flags          = 0;
     d->rect           = zero_Rect();
     d->minSize        = zero_I2();
+    d->sizeRef        = NULL;
     d->bgColor        = none_ColorId;
     d->frameColor     = none_ColorId;
     init_Anim(&d->visualOffset, 0.0f);
@@ -329,6 +330,9 @@ static void setWidth_Widget_(iWidget *d, int width) {
 
 static void 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) {
@@ -415,6 +419,10 @@ static void boundsOfChildren_Widget_(const iWidget *d, iRect *bounds_out) {
 
 static void arrange_Widget_(iWidget *d) {
     TRACE(d, "arranging...");
+    if (d->sizeRef) {
+        d->rect.size.y = height_Widget(d->sizeRef);
+        TRACE(d, "use referenced height: %d", d->rect.size.y);
+    }
     if (d->flags & moveToParentLeftEdge_WidgetFlag) {
         d->rect.pos.x = d->padding[0]; /* FIXME: Shouldn't this be d->parent->padding[0]? */
         TRACE(d, "move to parent left edge: %d", d->rect.pos.x);
diff --git a/src/ui/widget.h b/src/ui/widget.h
index 5b6b18e1..5c05e917 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -134,6 +134,7 @@ struct Impl_Widget {
     int64_t      flags;
     iRect        rect;
     iInt2        minSize;
+    iWidget *    sizeRef;
     int          padding[4]; /* left, top, right, bottom */
     iAnim        visualOffset;
     int          bgColor;