Mercurial > hg > ristipolku

diff game/Engine.java @ 175:55ea5821c802

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Implement "real" widget modality.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 16 Mar 2017 10:42:54 +0200
parents 8995a0363e0a
children 9d3ff9605555
line wrap: on
line diff
--- a/game/Engine.java	Mon Mar 06 11:55:40 2017 +0200
+++ b/game/Engine.java	Thu Mar 16 10:42:54 2017 +0200
@@ -700,18 +700,12 @@
 
     public void mousePressed(MouseEvent e)
     {
-        if (widgets.containsObject(aboutBox))
-            aboutBox.mousePressed(e);
-        else
-            widgets.mousePressed(e);
+        widgets.mousePressed(e);
     }
 
     public void mouseReleased(MouseEvent e)
     {
-        if (widgets.containsObject(aboutBox))
-            aboutBox.mouseReleased(e);
-        else
-            widgets.mouseReleased(e);
+        widgets.mouseReleased(e);
     }
 
     public void mouseClicked(MouseEvent e)
@@ -725,7 +719,8 @@
 
     public void mouseWheelMoved(MouseWheelEvent e)
     {
-        lauta.mouseWheelMoved(e);
+        if (widgets.getActiveModalWidget() == null)
+            lauta.mouseWheelMoved(e);
     }
 
     public void keyTyped(KeyEvent e) { }
@@ -733,13 +728,7 @@
 
     public void keyPressed(KeyEvent e)
     {
-        // Handle keyboard input
-
-        // About box is modal, so pass key events to it when active
-        if (widgets.containsObject(aboutBox))
-            aboutBox.keyPressed(e);
-        else
-            widgets.keyPressed(e);
+        widgets.keyPressed(e);
     }
 
     public void run()