Fixed diagram mouse wheel zooming for HiDPI monitors with zoom

[simantics/platform.git] / bundles / org.simantics.utils.ui / src / org / simantics / utils / ui / SWTDPIUtil.java

diff --git a/bundles/org.simantics.utils.ui/src/org/simantics/utils/ui/SWTDPIUtil.java b/bundles/org.simantics.utils.ui/src/org/simantics/utils/ui/SWTDPIUtil.java
index 43d19efb2571cd987d380de84f9b8d0b824b795e..0fe51a9f2688b0b4957e6b433c8efd9b7bfe0793 100644 (file)
--- a/bundles/org.simantics.utils.ui/src/org/simantics/utils/ui/SWTDPIUtil.java
+++ b/bundles/org.simantics.utils.ui/src/org/simantics/utils/ui/SWTDPIUtil.java
@@ -218,7 +218,8 @@ public class SWTDPIUtil {
        }
 
        public static Point2D upscaleSwt(Point2D p) {
-               return upscaleSwt(p.getX(), p.getY());
+               initialize();
+               return (hasSwtScale && p != null) ? upscaleSwt(p.getX(), p.getY()) : p;
        }
 
        public static Point upscaleSwtToInteger(Point2D p) {
@@ -227,7 +228,8 @@ public class SWTDPIUtil {
        }
 
        public static Point upscaleSwt(Point p) {
-               return upscaleSwt(p.x, p.y);
+               initialize();
+               return (hasSwtScale && p != null) ? upscaleSwt(p.x, p.y) : p;
        }
 
        public static Rectangle2D upscaleSwt(Rectangle2D r, Rectangle2D target) {