libgui|DialogWidget: Minimum width for buttons

The "OK" button has been a bit too narrow, especially usually being the default button.
skyjake · Jan 5, 2020 · a9a6702 · a9a6702
1 parent 132a79f
commit a9a6702
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/doomsday/libs/gui/include/de/widgets/labelwidget.h b/doomsday/libs/gui/include/de/widgets/labelwidget.h
@@ -177,6 +177,8 @@ class LIBGUI_PUBLIC LabelWidget : public GuiWidget, public IAssetGroup
 
     void setMaximumTextWidth(const Rule &pixels);
 
+    void setMinimumWidth(const Rule &minWidth);
+
     void setMinimumHeight(const Rule &minHeight);
 
     /**

diff --git a/doomsday/libs/gui/net.dengine.stdlib.gui.pack/rules.dei b/doomsday/libs/gui/net.dengine.stdlib.gui.pack/rules.dei
@@ -54,8 +54,9 @@ list {
 }
 
 dialog {
-    rule gap       { constant $= UNIT * 2 }
-    rule separator { constant $= UNIT * 4 }
+    rule gap             { constant $= UNIT * 2 }
+    rule separator       { constant $= UNIT * 4 }
+    rule button.minwidth { constant $= UNIT * 20 }
 
     rule message.width { constant $= UNIT * 115 }
 }
diff --git a/doomsday/libs/gui/src/widgets/dialogwidget.cpp b/doomsday/libs/gui/src/widgets/dialogwidget.cpp
@@ -332,7 +332,7 @@ DE_GUI_PIMPL(DialogWidget)
                 }
                 else if (i->role() & (Reject | No))
                 {
-                    but.setActionFn([this](){ self().reject(); });
+                    but.setActionFn([this]() { self().reject(); });
                 }
             }
         }
@@ -347,6 +347,12 @@ DE_GUI_PIMPL(DialogWidget)
             // Button images must be a certain size.
             but.setOverrideImageSize(style().fonts().font("default").height());
 
+            // Normal buttons should not be too small.
+            if (~i->role() & Action)
+            {
+                but.setMinimumWidth(rule("dialog.button.minwidth"));
+            }
+
             // Set default label?
             if (item.label().isEmpty())
             {

diff --git a/doomsday/libs/gui/src/widgets/labelwidget.cpp b/doomsday/libs/gui/src/widgets/labelwidget.cpp
@@ -56,6 +56,7 @@ public Font::RichFormat::IStyle
 
     ConstantRule *width;
     ConstantRule *height;
+    IndirectRule *minWidth;
     IndirectRule *minHeight;
     const Rule *outHeight;
     AnimationRule *appearSize;
@@ -73,10 +74,10 @@ public Font::RichFormat::IStyle
     ColorBank::Color altAccentColor;
     const Font::RichFormat::IStyle *richStyle;
 
+    // Content.
     String styledText;
     TextDrawable glText;
     mutable Vec2ui latestTextSize;
-
     std::unique_ptr<ProceduralImage> image;
     std::unique_ptr<ProceduralImage> overlayImage;
     GuiVertexBuilder verts;
@@ -104,6 +105,7 @@ public Font::RichFormat::IStyle
     {
         width     = new ConstantRule(0);
         height    = new ConstantRule(0);
+        minWidth  = new IndirectRule;
         minHeight = new IndirectRule;
         outHeight = new OperatorRule(OperatorRule::Maximum, *height, *minHeight);
 
@@ -117,6 +119,7 @@ public Font::RichFormat::IStyle
     {
         releaseRef(width);
         releaseRef(height);
+        releaseRef(minWidth);
         releaseRef(minHeight);
         releaseRef(outHeight);
         releaseRef(appearSize);
@@ -766,6 +769,11 @@ void LabelWidget::setMaximumTextWidth(const Rule &pixels)
     requestGeometry();
 }
 
+void LabelWidget::setMinimumWidth(const Rule &minWidth)
+{
+    d->minWidth->setSource(minWidth);
+}
+
 void LabelWidget::setMinimumHeight(const Rule &minHeight)
 {
     d->minHeight->setSource(minHeight);
@@ -885,7 +893,7 @@ void LabelWidget::setWidthPolicy(SizePolicy policy)
     d->horizPolicy = policy;
     if (policy == Expand)
     {
-        rule().setInput(Rule::Width, *d->widthRule());
+        rule().setInput(Rule::Width, OperatorRule::maximum(*d->minWidth, *d->widthRule()));
     }
     else
     {