Client|ScrollAreaWidget: Setting content size using rules

skyjake · Jun 15, 2013 · a5d171a · a5d171a
1 parent 34b92d9
commit a5d171a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/doomsday/client/include/ui/widgets/scrollareawidget.h b/doomsday/client/include/ui/widgets/scrollareawidget.h
@@ -45,6 +45,8 @@ class ScrollAreaWidget : public GuiWidget
 
     void setContentWidth(int width);
     void setContentHeight(int height);
+    void setContentWidth(de::Rule const &width);
+    void setContentHeight(de::Rule const &height);
     void setContentSize(de::Vector2i const &size);
 
     void modifyContentWidth(int delta);

diff --git a/doomsday/client/src/ui/widgets/scrollareawidget.cpp b/doomsday/client/src/ui/widgets/scrollareawidget.cpp
@@ -159,12 +159,24 @@ void ScrollAreaWidget::setContentWidth(int width)
     d->contentRule.setInput(Rule::Width, Const(width));
 }
 
+void ScrollAreaWidget::setContentWidth(Rule const &width)
+{
+    DENG2_GUARD(d);
+    d->contentRule.setInput(Rule::Width, width);
+}
+
 void ScrollAreaWidget::setContentHeight(int height)
 {
     DENG2_GUARD(d);
     d->contentRule.setInput(Rule::Height, Const(height));
 }
 
+void ScrollAreaWidget::setContentHeight(Rule const &height)
+{
+    DENG2_GUARD(d);
+    d->contentRule.setInput(Rule::Height, height);
+}
+
 void ScrollAreaWidget::setContentSize(Vector2i const &size)
 {
     DENG2_GUARD(d);
@@ -316,7 +328,8 @@ bool ScrollAreaWidget::handleEvent(Event const &event)
         if(mouse.wheelMotion() == MouseEvent::FineAngle)
         {
             d->y->set(de::clamp(0, int(d->y->animation().target()) +
-                                mouse.wheel().y / 2, d->maxY->valuei()), .05f);
+                                mouse.wheel().y / 2 * (d->origin == Top? -1 : 1),
+                                d->maxY->valuei()), .05f);
             d->restartScrollOpacityFade();
         }
         return true;