Workaround connection line dash spacing bug on Windows 200% scale

- See eclipse-platform/eclipse.platform.swt#687 - See eclipse-gef/gef-classic#206
archimatetool · Jun 5, 2023 · 8c07252 · 8c07252
1 parent dcf42f1
commit 8c07252
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/...ool.export.svg/src/com/archimatetool/export/svg/graphiti/GraphicsToGraphics2DAdaptor.java b/...ool.export.svg/src/com/archimatetool/export/svg/graphiti/GraphicsToGraphics2DAdaptor.java
@@ -1111,7 +1111,7 @@ public void setLineDash(int[] dash) {
     public void setLineDash(float[] dash) {
         currentState.lineAttributes.dash = dash;
         setLineStyle(Graphics.LINE_CUSTOM);
-        swtGraphics.setLineDash(dash);
+        swtGraphics.setLineDash(dash, false);
     }
 
     /*

diff --git a/org.eclipse.draw2d/src/org/eclipse/draw2d/SWTGraphics.java b/org.eclipse.draw2d/src/org/eclipse/draw2d/SWTGraphics.java
@@ -1283,7 +1283,22 @@ public void setInterpolation(int interpolation) {
 
     @Override
     public void setLineAttributes(LineAttributes lineAttributes) {
+        setLineAttributes(lineAttributes, true);
+    }
+
+    @SuppressWarnings("restriction")
+    public void setLineAttributes(LineAttributes lineAttributes, boolean adjustForWindowsHiDPI) {
         copyLineAttributes(currentState.lineAttributes, lineAttributes);
+
+        /*
+         * Hack to workaround bug on Windows 200% scaling where dashes are half size
+         * See https://github.com/eclipse-platform/eclipse.platform.swt/issues/687
+         */
+        if(adjustForWindowsHiDPI && currentState.lineAttributes.dash != null && "win32".equals(SWT.getPlatform()) && org.eclipse.swt.internal.DPIUtil.getDeviceZoom() == 200) { //$NON-NLS-1$
+            for(int i = 0; i < currentState.lineAttributes.dash.length; i++) {
+                currentState.lineAttributes.dash[i] *= 2;
+            }
+        }
     }
 
     /**
@@ -1315,13 +1330,28 @@ public void setLineDash(int[] dashes) {
      */
     @Override
     public void setLineDash(float[] value) {
+        setLineDash(value, true);
+    }
+
+    @SuppressWarnings("restriction")
+    public void setLineDash(float[] value, boolean adjustForWindowsHiDPI) {
         if (value != null) {
             // validate dash values
             for (int i = 0; i < value.length; i++) {
                 if (value[i] <= 0) {
                     SWT.error(SWT.ERROR_INVALID_ARGUMENT);
                 }
             }
+
+            /*
+             * Hack to workaround bug on Windows 200% scaling where dashes are half size
+             * See https://github.com/eclipse-platform/eclipse.platform.swt/issues/687
+             */
+            if(adjustForWindowsHiDPI && "win32".equals(SWT.getPlatform()) && org.eclipse.swt.internal.DPIUtil.getDeviceZoom() == 200) { //$NON-NLS-1$
+                for(int i = 0; i < value.length; i++) {
+                    value[i] *= 2;
+                }
+            }
 
             currentState.lineAttributes.dash = value.clone();
             currentState.lineAttributes.style = SWT.LINE_CUSTOM;