X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.g2d%2Fsrc%2Forg%2Fsimantics%2Fg2d%2Fevent%2Fadapter%2FSWTMouseEventAdapter.java;h=1da7fe6472ee78af0900d84d64f85ba3a9e5d312;hb=refs%2Fchanges%2F59%2F2659%2F2;hp=bb8560c306a1da6091adca58c1c104b50405ed1a;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.g2d/src/org/simantics/g2d/event/adapter/SWTMouseEventAdapter.java b/bundles/org.simantics.g2d/src/org/simantics/g2d/event/adapter/SWTMouseEventAdapter.java
index bb8560c30..1da7fe647 100644
--- a/bundles/org.simantics.g2d/src/org/simantics/g2d/event/adapter/SWTMouseEventAdapter.java
+++ b/bundles/org.simantics.g2d/src/org/simantics/g2d/event/adapter/SWTMouseEventAdapter.java
@@ -34,6 +34,7 @@ import org.simantics.scenegraph.g2d.events.MouseEvent.MouseExitEvent;
 import org.simantics.scenegraph.g2d.events.MouseEvent.MouseMovedEvent;
 import org.simantics.scenegraph.g2d.events.MouseEvent.MouseWheelMovedEvent;
 import org.simantics.scenegraph.g2d.events.adapter.AbstractEventAdapter;
+import org.simantics.utils.ui.SWTDPIUtil;
 
 public class SWTMouseEventAdapter extends AbstractEventAdapter implements MouseListener, MouseMoveListener, MouseTrackListener, MouseWheelListener {
 
@@ -64,12 +65,12 @@ public class SWTMouseEventAdapter extends AbstractEventAdapter implements MouseL
 	
 	private Point2D getControlPosition(MouseEvent e)
 	{
-		return new Point2D.Double(e.x, e.y);
+		return new Point2D.Double(SWTDPIUtil.upscaleSwt(e.x), SWTDPIUtil.upscaleSwt(e.y));
 	}
 	
 	private Point2D getScreenPosition(MouseEvent e)
 	{
-		Point p = e.display.getCursorLocation();
+		Point p = SWTDPIUtil.upscaleSwt(e.display.getCursorLocation());
 		return new Point2D.Double(p.x, p.y);
 		
 	}
@@ -165,8 +166,8 @@ public class SWTMouseEventAdapter extends AbstractEventAdapter implements MouseL
 				sender, e.time & 0xffffffff, MOUSE_ID, buttonStatus, 
 				getStateMask(e),
 				getControlPosition(e), getScreenPosition(e), 
-				MouseWheelMovedEvent.WHEEL_UNIT_SCROLL, 
-				0, 
+				MouseWheelMovedEvent.WHEEL_UNIT_SCROLL,
+				MouseWheelMovedEvent.SCROLL_AMOUNT_ZERO,
 				e.count
 				));
 	}