Fixed|libappfw: Popup maximum height is limited to the view height

skyjake · Jan 13, 2017 · 78f8702 · 78f8702
1 parent 53f2042
commit 78f8702
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/doomsday/sdk/libappfw/src/guirootwidget.cpp b/doomsday/sdk/libappfw/src/guirootwidget.cpp
@@ -335,17 +335,7 @@ bool GuiRootWidget::processEvent(Event const &event)
     }
 
     bool const wasProcessed = RootWidget::processEvent(event);
-//    {
-//        if (event.type() == Event::MouseButton)
-//        {
-//            // Button events that no one handles will relinquish input focus.
-//            //setFocus(0);
-//        }
-    window().glDone();
     return wasProcessed;
-//    }
-//    window().glDone();
-//    return true;
 }
 
 void GuiRootWidget::handleEventAsFallback(Event const &)

diff --git a/doomsday/sdk/libappfw/src/widgets/popupmenuwidget.cpp b/doomsday/sdk/libappfw/src/widgets/popupmenuwidget.cpp
@@ -468,6 +468,9 @@ void PopupMenuWidget::preparePanelForOpening()
 {
     // Redo the layout.
     menu().updateLayout();
+    menu().rule().setInput(Rule::Height,
+                           OperatorRule::minimum(menu().rule().inputRule(Rule::Height),
+                                                 root().viewHeight() - margins().height()));
     d->updateItemHitRules();
     d->updateItemMargins();