Widgets|libappfw: Setting a minimum content height for labels

skyjake · Oct 15, 2016 · 9eb2023 · 9eb2023
1 parent 78ff6ed
commit 9eb2023
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/doomsday/sdk/libappfw/include/de/widgets/labelwidget.h b/doomsday/sdk/libappfw/include/de/widgets/labelwidget.h
@@ -175,6 +175,8 @@ class LIBAPPFW_PUBLIC LabelWidget : public GuiWidget, public IAssetGroup
 
     void setMaximumTextWidth(Rule const &pixels);
 
+    void setMinimumContentHeight(Rule const &minHeight);
+
     /**
      * Sets an alternative style for text. By default, the rich text styling comes
      * from Style.

diff --git a/doomsday/sdk/libappfw/src/widgets/labelwidget.cpp b/doomsday/sdk/libappfw/src/widgets/labelwidget.cpp
@@ -56,6 +56,8 @@ public Font::RichFormat::IStyle
 
     ConstantRule *width;
     ConstantRule *height;
+    IndirectRule *minHeight;
+    Rule const *outHeight;
     AnimationRule *appearSize;
     LabelWidget::AppearanceAnimation appearType;
     TimeDelta appearSpan;
@@ -105,8 +107,10 @@ public Font::RichFormat::IStyle
         , uMvpMatrix  ("uMvpMatrix", GLUniform::Mat4)
         , uColor      ("uColor",     GLUniform::Vec4)
     {
-        width  = new ConstantRule(0);
-        height = new ConstantRule(0);
+        width     = new ConstantRule(0);
+        height    = new ConstantRule(0);
+        minHeight = new IndirectRule;
+        outHeight = new OperatorRule(OperatorRule::Maximum, *height, *minHeight);
 
         uColor = Vector4f(1, 1, 1, 1);
         updateStyle();
@@ -119,6 +123,8 @@ public Font::RichFormat::IStyle
     {
         releaseRef(width);
         releaseRef(height);
+        releaseRef(minHeight);
+        releaseRef(outHeight);
         releaseRef(appearSize);
         releaseRef(maxTextWidth);
     }
@@ -568,7 +574,7 @@ public Font::RichFormat::IStyle
         {
         case AppearInstantly:
         case AppearGrowHorizontally:
-            if (vertPolicy == Expand) return height;
+            if (vertPolicy == Expand) return outHeight;
             break;
 
         case AppearGrowVertically:
@@ -733,6 +739,11 @@ void LabelWidget::setMaximumTextWidth(Rule const &pixels)
     requestGeometry();
 }
 
+void LabelWidget::setMinimumContentHeight(Rule const &minHeight)
+{
+    d->minHeight->setSource(minHeight);
+}
+
 void LabelWidget::setTextStyle(Font::RichFormat::IStyle const *richStyle)
 {
     d->richStyle = richStyle;