UI|Client: Popup menu content scrolling

When a popup menu is too tall to fit into view, the menu will scroll accordingly.
skyjake · Sep 1, 2013 · 9dc4024 · 9dc4024
1 parent 34ea8b0
commit 9dc4024
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 7 deletions.
diff --git a/doomsday/client/include/ui/widgets/popupmenuwidget.h b/doomsday/client/include/ui/widgets/popupmenuwidget.h
@@ -32,6 +32,9 @@ class PopupMenuWidget : public PopupWidget
 
     MenuWidget &menu() const;
 
+    // Events.
+    void update();
+
 protected:
     void glMakeGeometry(DefaultVertexBuf::Builder &verts);
     void preparePopupForOpening();

diff --git a/doomsday/client/include/ui/widgets/popupwidget.h b/doomsday/client/include/ui/widgets/popupwidget.h
@@ -57,6 +57,9 @@ class PopupWidget : public GuiWidget
     void setAnchorX(de::Rule const &x);
     void setAnchorY(de::Rule const &y);
 
+    de::Rule const &anchorX() const;
+    de::Rule const &anchorY() const;
+
     /**
      * Sets the preferred opening direction of the popup. If there isn't enough
      * room in the specified direction, the opposite direction is used instead.

diff --git a/doomsday/client/include/ui/windowsystem.h b/doomsday/client/include/ui/windowsystem.h
@@ -96,6 +96,12 @@ class WindowSystem : public de::System
      */
     Style &style();
 
+    /**
+     * Dispatches a mouse position event with the latest mouse position. This
+     * happens automatically whenever the mouse has moved and time advances.
+     */
+    void dispatchLatestMousePosition();
+
     // System.
     bool processEvent(de::Event const &);
     void timeChanged(de::Clock const &);

diff --git a/doomsday/client/src/ui/widgets/popupmenuwidget.cpp b/doomsday/client/src/ui/widgets/popupmenuwidget.cpp
@@ -21,6 +21,7 @@
 #include "GuiRootWidget"
 #include "ContextWidgetOrganizer"
 #include "ui/Item"
+#include "clientapp.h"
 
 using namespace de;
 
@@ -31,9 +32,9 @@ DENG2_OBSERVES(ContextWidgetOrganizer, WidgetCreation),
 DENG2_OBSERVES(ContextWidgetOrganizer, WidgetUpdate)
 {
     ButtonWidget *hover;
-    Rectanglei hoverHighlightRect;
+    int oldScrollY;
 
-    Instance(Public *i) : Base(i), hover(0) {}
+    Instance(Public *i) : Base(i), hover(0), oldScrollY(0) {}
 
     void widgetCreatedForItem(GuiWidget &widget, ui::Item const &item)
     {
@@ -144,14 +145,33 @@ DENG2_OBSERVES(ContextWidgetOrganizer, WidgetUpdate)
             hi.bottomRight.x = hover->hitRule().right().valuei();
             hi.bottomRight.y = hover->hitRule().bottom().valuei();
         }
-        return hi;
+        // Clip the highlight to the main popup area.
+        return hi & self.rule().recti();
     }
 
     void buttonActionTriggered(ButtonWidget &)
     {
         // The popup menu is closed when an action is triggered.
         self.close();
     }
+
+    void updateIfScrolled()
+    {
+        // If the menu is scrolled, we need to update some things.
+        int scrollY = self.menu().scrollPositionY().valuei();
+        if(scrollY == oldScrollY)
+        {
+            return;
+        }
+        oldScrollY = scrollY;
+
+        //qDebug() << "menu scrolling" << scrollY;
+
+        // Resend the mouse position so the buttons realize they've moved.
+        ClientApp::windowSystem().dispatchLatestMousePosition();
+
+        self.requestGeometry();
+    }
 };
 
 PopupMenuWidget::PopupMenuWidget(String const &name)
@@ -170,6 +190,12 @@ MenuWidget &PopupMenuWidget::menu() const
     return static_cast<MenuWidget &>(content());
 }
 
+void PopupMenuWidget::update()
+{
+    PopupWidget::update();
+    d->updateIfScrolled();
+}
+
 void PopupMenuWidget::glMakeGeometry(DefaultVertexBuf::Builder &verts)
 {
     PopupWidget::glMakeGeometry(verts);
@@ -190,6 +216,14 @@ void PopupMenuWidget::preparePopupForOpening()
     menu().updateLayout();
     d->updateItemHitRules();
 
+    // Make sure the menu doesn't go beyond the top of the view.
+    if(openingDirection() == ui::Up)
+    {
+        menu().rule().setInput(Rule::Height,
+                OperatorRule::minimum(menu().contentRule().height() + menu().margins().height(),
+                                      anchorY() - menu().margins().top()));
+    }
+
     PopupWidget::preparePopupForOpening();
 }
 

diff --git a/doomsday/client/src/ui/widgets/popupwidget.cpp b/doomsday/client/src/ui/widgets/popupwidget.cpp
@@ -298,6 +298,16 @@ void PopupWidget::setAnchorY(Rule const &y)
     d->anchorY = holdRef(y);
 }
 
+Rule const &PopupWidget::anchorX() const
+{
+    return *d->anchorX;
+}
+
+Rule const &PopupWidget::anchorY() const
+{
+    return *d->anchorY;
+}
+
 void PopupWidget::setOpeningDirection(ui::Direction dir)
 {
     d->dir = dir;

diff --git a/doomsday/client/src/ui/windowsystem.cpp b/doomsday/client/src/ui/windowsystem.cpp
@@ -46,13 +46,17 @@ DENG2_PIMPL(WindowSystem)
         self.closeAll();
     }
 
-    void dispatchLatestMousePosition()
+    void processLatestMousePosition()
+    {
+        self.main().root().processEvent(MouseEvent(MouseEvent::Absolute, latestMousePos));
+    }
+
+    void processLatestMousePositionIfMoved()
     {
         if(mouseMoved)
         {
             mouseMoved = false;
-
-            self.main().root().processEvent(MouseEvent(MouseEvent::Absolute, latestMousePos));
+            processLatestMousePosition();
         }
     }
 };
@@ -103,6 +107,11 @@ Style &WindowSystem::style()
     return d->style;
 }
 
+void WindowSystem::dispatchLatestMousePosition()
+{
+    d->processLatestMousePosition();
+}
+
 bool WindowSystem::processEvent(Event const &event)
 {
     /*
@@ -131,7 +140,7 @@ bool WindowSystem::processEvent(Event const &event)
 
 void WindowSystem::timeChanged(Clock const &/*clock*/)
 {
-    d->dispatchLatestMousePosition();
+    d->processLatestMousePositionIfMoved();
 
     // Update periodically.
     main().root().update();