Merge branch 'master' of github.com:skyjake/Doomsday-Engine

skyjake · Jan 19, 2014 · b423204 · b423204
2 parents b5aaabf + ed55cfc
commit b423204
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/doomsday/client/src/ui/clientwindow.cpp b/doomsday/client/src/ui/clientwindow.cpp
@@ -370,7 +370,8 @@ DENG2_OBSERVES(App,              StartupComplete)
         MouseEvent ev = event;
 
         // Translate mouse coordinates for direct interaction.
-        if(ev.type() == Event::MousePosition || ev.type() == Event::MouseButton)
+        if(ev.type() == Event::MousePosition || ev.type() == Event::MouseButton ||
+           ev.type() == Event::MouseWheel)
         {
             ev.setPos(contentXf.windowToLogicalCoords(event.pos()).toVector2i());
         }

diff --git a/doomsday/libappfw/src/widgets/popupwidget.cpp b/doomsday/libappfw/src/widgets/popupwidget.cpp
@@ -298,6 +298,8 @@ bool PopupWidget::handleEvent(Event const &event)
                      */
                     if(GuiWidget const *hit = root().globalHitTest(mouse.pos()))
                     {
+                        DENG2_ASSERT(hit != this); // !inside
+
                         if(hit->isEnabled() && hit->isVisible())
                         {
                             // Replay the click on this widget.