X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.utils.ui%2Fsrc%2Forg%2Fsimantics%2Futils%2Fui%2FSWTDPIUtil.java;fp=bundles%2Forg.simantics.utils.ui%2Fsrc%2Forg%2Fsimantics%2Futils%2Fui%2FSWTDPIUtil.java;h=0fe51a9f2688b0b4957e6b433c8efd9b7bfe0793;hb=b2f1da4c219c646ba3fce0498bf757d64c6dca6d;hp=43d19efb2571cd987d380de84f9b8d0b824b795e;hpb=f212fa100ac8c0ce464a826794b3d1737b138b25;p=simantics%2Fplatform.git

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 43d19efb2..0fe51a9f2 100644
--- 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) {