Client|ScrollAreaWidget: Scroll area clips children

skyjake · Jun 20, 2013 · 8fe9d06 · 8fe9d06
1 parent 2d2d143
commit 8fe9d06
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/doomsday/client/include/ui/widgets/scrollareawidget.h b/doomsday/client/include/ui/widgets/scrollareawidget.h
@@ -44,8 +44,8 @@ class ScrollAreaWidget : public GuiWidget
     void setIndicatorUv(de::Vector2f const &uvPoint);
 
     void setContentWidth(int width);
-    void setContentHeight(int height);
     void setContentWidth(de::Rule const &width);
+    void setContentHeight(int height);
     void setContentHeight(de::Rule const &height);
     void setContentSize(de::Vector2i const &size);
 
@@ -114,6 +114,8 @@ class ScrollAreaWidget : public GuiWidget
 
     // Events.
     void update();
+    void preDrawChildren();
+    void postDrawChildren();
     bool handleEvent(de::Event const &event);
 
 public slots:

diff --git a/doomsday/client/src/ui/widgets/scrollareawidget.cpp b/doomsday/client/src/ui/widgets/scrollareawidget.cpp
@@ -21,6 +21,7 @@
 
 #include "ui/widgets/scrollareawidget.h"
 
+#include <de/GLState>
 #include <de/KeyEvent>
 #include <de/MouseEvent>
 #include <de/Lockable>
@@ -59,6 +60,8 @@ DENG2_PIMPL(ScrollAreaWidget), public Lockable
           margin(0),
           vertMargin(0)
     {
+        contentRule.setDebugName("ScrollArea-contentRule");
+
         updateStyle();
 
         x = new ScalarRule(0);
@@ -105,6 +108,8 @@ DENG2_PIMPL(ScrollAreaWidget), public Lockable
 ScrollAreaWidget::ScrollAreaWidget(String const &name)
     : GuiWidget(name), d(new Instance(this))
 {
+    setBehavior(ChildHitClipping);
+
     // Link the content rule into the widget's rectangle.
     d->contentRule.setInput(Rule::Left, rule().left() + *d->margin -
                             OperatorRule::minimum(*d->x, *d->maxX));
@@ -448,3 +453,13 @@ void ScrollAreaWidget::update()
         d->y->set(d->maxY->value());
     }
 }
+
+void ScrollAreaWidget::preDrawChildren()
+{
+    GLState::push().setNormalizedScissor(normalizedRect());
+}
+
+void ScrollAreaWidget::postDrawChildren()
+{
+    GLState::pop();
+}