4 files changed, 36 insertions, 14 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index be831829..53f44868 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -2380,20 +2380,19 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         }
     }
     else if (equal_Command(cmd, "document.autoreload.menu") && document_App() == d) {
-        iWidget *dlg = makeQuestion_Widget(uiTextAction_ColorEscape "${heading.autoreload}",
-                                           "${dlg.autoreload}",
-                                           (iMenuItem[]){ { "${cancel}", 0, 0, NULL } },
-                                           1);
+        iArray *items = collectNew_Array(sizeof(iMenuItem));
         for (int i = 0; i < max_ReloadInterval; ++i) {
-            insertChildAfterFlags_Widget(
-                dlg,
-                iClob(new_LabelWidget(label_ReloadInterval_(i),
-                                      format_CStr("document.autoreload.set arg:%d", i))),
-                i + 1,
-                resizeToParentWidth_WidgetFlag |
-                    ((int) d->mod.reloadInterval == i ? selected_WidgetFlag : 0));
-        }
-        arrange_Widget(dlg);
+            pushBack_Array(items, &(iMenuItem){
+                format_CStr("%s%s", ((int) d->mod.reloadInterval == i ? "=" : "-"),
+                                     label_ReloadInterval_(i)),
+                0,
+                0,
+                format_CStr("document.autoreload.set arg:%d", i) });
+        }
+        pushBack_Array(items, &(iMenuItem){ "${cancel}", 0, 0, NULL });
+        makeQuestion_Widget(uiTextAction_ColorEscape "${heading.autoreload}",
+                            "${dlg.autoreload}",
+                            constData_Array(items), size_Array(items));
         return iTrue;
     }
     else if (equal_Command(cmd, "document.autoreload.set") && document_App() == d) {
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index 16fee26d..ee535120 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -39,7 +39,7 @@ struct Impl_LabelWidget {
     iChar   icon;
     int     forceFg;
     iString command;
-    iBool   alignVisual; /* align according to visible bounds, not typography */
+    iBool   alignVisual; /* align according to visible bounds, not font metrics */
     iClick  click;
 };
 
diff --git a/src/ui/util.c b/src/ui/util.c
index c518d5db..fb12dd7c 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1685,6 +1685,9 @@ iWidget *makeDialogButtons_Widget(const iMenuItem *actions, size_t numActions) {
         int         key       = actions[i].key;
         int         kmods     = actions[i].kmods;
         const iBool isDefault = (i == numActions - 1);
+        if (*label == '=' || *label == '-') {
+            continue; /* Special value selection items for a Question dialog. */
+        }
         if (!iCmpStr(label, "---")) {
             /* Separator.*/
             addChildFlags_Widget(div, iClob(new_Widget()), expand_WidgetFlag);
@@ -1792,6 +1795,20 @@ iWidget *makeQuestion_Widget(const char *title, const char *msg,
     setCommandHandler_Widget(dlg, messageHandler_);
     addChildFlags_Widget(dlg, iClob(new_LabelWidget(title, NULL)), frameless_WidgetFlag);
     addChildFlags_Widget(dlg, iClob(new_LabelWidget(msg, NULL)), frameless_WidgetFlag);
+    /* Check for value selections. */
+    for (size_t i = 0; i < numItems; i++) {
+        const iMenuItem *item = &items[i];
+        const char first = item->label[0];
+        if (first == '-' || first == '=') {
+            addChildFlags_Widget(dlg,
+                                 iClob(newKeyMods_LabelWidget(item->label + 1,
+                                                              item->key,
+                                                              item->kmods,
+                                                              item->command)),
+                                 resizeToParentWidth_WidgetFlag |
+                                 (first == '=' ? selected_WidgetFlag : 0));
+        }
+    }
     addChild_Widget(dlg, iClob(makePadding_Widget(gap_UI)));
     addChild_Widget(dlg, iClob(makeDialogButtons_Widget(items, numItems)));
     addChild_Widget(get_Window()->root, iClob(dlg));
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 431d93c2..2048867d 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -1161,12 +1161,18 @@ iAny *insertChildAfter_Widget(iWidget *d, iAnyObject *child, size_t afterIndex)
     iAssert(!widget->parent);
     iAssert(d->children);
     iAssert(afterIndex < size_ObjectList(d->children));
+    iBool wasInserted = iFalse;
     iForEach(ObjectList, i, d->children) {
         if (afterIndex-- == 0) {
             insertAfter_ObjectList(d->children, i.value, child);
+            wasInserted = iTrue;
             break;
         }
     }
+    if (!wasInserted) {
+        /* Someone is confused about the number of children? We still have to add this. */
+        pushBack_ObjectList(d->children, child);
+    }
     widget->parent = d;
     return child;
 }