Add mousewheel scrolling, but I'll bet this doesn't work on OSX

diff --git a/TODO.txt b/TODO.txt
index ec1d3bd19d3174059ac7aa264ef2493199452125..9a81ea15825f2dca52f655f805e9fa4481e305c3 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -81,7 +81,6 @@ Requested enhancements
 
 == UI ==
 
 
 == UI ==
 

-* Mouse wheel zooming

 * Bbox-sensitive menu for background imagery
 * CSS editing
 * Quick-search on add-relations-to-way dialog (RelationSelectPanel)
 * Bbox-sensitive menu for background imagery
 * CSS editing
 * Quick-search on add-relations-to-way dialog (RelationSelectPanel)

diff --git a/net/systemeD/potlatch2/EditController.as b/net/systemeD/potlatch2/EditController.as
index 2ca88c3d24a0e6fa0f424cd27e1fcfd43b7cdbfb..45201c056b42361f4182d727230e0f3bdce9ff11 100644 (file)
--- a/net/systemeD/potlatch2/EditController.as
+++ b/net/systemeD/potlatch2/EditController.as
@@ -38,6 +38,7 @@ package net.systemeD.potlatch2 {
             map.parent.addEventListener(MouseEvent.MOUSE_MOVE, mapMouseEvent);
             map.parent.addEventListener(MouseEvent.MOUSE_UP, mapMouseEvent);
             map.parent.addEventListener(MouseEvent.MOUSE_DOWN, mapMouseEvent);
             map.parent.addEventListener(MouseEvent.MOUSE_MOVE, mapMouseEvent);
             map.parent.addEventListener(MouseEvent.MOUSE_UP, mapMouseEvent);
             map.parent.addEventListener(MouseEvent.MOUSE_DOWN, mapMouseEvent);

+            map.parent.addEventListener(MouseEvent.MOUSE_WHEEL, mapMouseEvent);

             map.parent.addEventListener(MouseEvent.CLICK, mapMouseEvent);
             map.parent.addEventListener(KeyboardEvent.KEY_DOWN, keyDownHandler);
             map.parent.addEventListener(KeyboardEvent.KEY_UP, keyUpHandler);
             map.parent.addEventListener(MouseEvent.CLICK, mapMouseEvent);
             map.parent.addEventListener(KeyboardEvent.KEY_DOWN, keyDownHandler);
             map.parent.addEventListener(KeyboardEvent.KEY_UP, keyUpHandler);

diff --git a/net/systemeD/potlatch2/controller/ControllerState.as b/net/systemeD/potlatch2/controller/ControllerState.as
index be13bb1792507bfda7f8df1ff53d9ccf830b5118..08f57df2a4b4b3b61010bcd11c4b115328e7711d 100644 (file)
--- a/net/systemeD/potlatch2/controller/ControllerState.as
+++ b/net/systemeD/potlatch2/controller/ControllerState.as
@@ -103,7 +103,13 @@ package net.systemeD.potlatch2.controller {
                                controller.map.setHighlight(focus, { hover: true });
                        } else if ( event.type == MouseEvent.MOUSE_OUT ) {
                                controller.map.setHighlight(focus, { hover: false });
                                controller.map.setHighlight(focus, { hover: true });
                        } else if ( event.type == MouseEvent.MOUSE_OUT ) {
                                controller.map.setHighlight(focus, { hover: false });

-                       }
+            } else if ( event.type == MouseEvent.MOUSE_WHEEL ) {
+                if (event.delta > 0) {
+                  map.zoomIn();
+                } else if (event.delta < 0) {
+                  map.zoomOut();
+                }
+            }

                        return null;
                }
 
                        return null;
                }