Add SwtKt (and demonstrate that SVG rasterization on mac is low-resolution) (#33)

Author: nedtwigg

CHANGES.md

@@ -1,6 +1,8 @@
 # DurianSwt releases
 
 ## [Unreleased]
+### Added
+- `com.diffplug.common.swt.SwtKt` which is required to instantiate `Point` or `Rectangle` in Kotlin starting with Eclipse 4.36 ([]() responding to [swt#1711](https://github.com/eclipse-platform/eclipse.platform.swt/pull/1711#issuecomment-2715777755))
 
 ## [5.2.0] - 2025-08-28
 ### Added

build.gradle

@@ -20,9 +20,6 @@ subprojects { subProject ->
 
 	ext.maven_name = subProject.name
 	ext.javadoc_links = [
-		"https://javadoc.io/doc/com.diffplug.durian/durian-collect/${VER_DURIAN}",
-		"https://javadoc.io/doc/com.diffplug.durian/durian-concurrent/${VER_DURIAN}",
-		"https://javadoc.io/doc/com.diffplug.durian/durian-rx/${VER_DURIAN_RX}",
 		'https://docs.oracle.com/javase/8/docs/api/'
 	].join(' ')
 

durian-swt/build.gradle

@@ -17,6 +17,7 @@ p2deps {
 	into 'testImplementation', {
 		p2repo "https://download.eclipse.org/eclipse/updates/$VER_ECLIPSE_PLATFORM/"
 		install 'org.eclipse.swt'
+		install 'org.eclipse.swt.svg'
 	}
 }
 dependencies {
@@ -61,6 +62,8 @@ test {
 
 // only run the interactive tests
 tasks.register('interactiveTest', Test) {
+	testClassesDirs = sourceSets.test.output.classesDirs
+	classpath = sourceSets.test.runtimeClasspath
 	systemProperty 'com.diffplug.test.autoclose.milliseconds', null
 	useJUnit {
 		includeCategories 'com.diffplug.common.swt.InteractiveTest'
@@ -69,3 +72,11 @@ tasks.register('interactiveTest', Test) {
 		}
 	}
 }
+
+tasks.register('runIssue2228', JavaExec) {
+	classpath = sourceSets.test.runtimeClasspath
+	mainClass = 'com.diffplug.common.swt.Issue_2228'
+	if (isMac) {
+		jvmArgs = ['-XstartOnFirstThread']
+	}
+}

durian-swt/src/main/java/com/diffplug/common/swt/Shells.kt

@@ -38,7 +38,7 @@ class Shells private constructor(private val style: Int, private val coat: Coat)
     private var title: String? = null
     private var image: Image? = null
     private var alpha = SWT.DEFAULT
-    private val size = Point(SWT.DEFAULT, SWT.DEFAULT)
+    private val size = SwtKt.Point(SWT.DEFAULT, SWT.DEFAULT)
     private var positionIncludesTrim = true
     private var location: Map.Entry<Corner, Point>? = null
     private var dontOpen = false
@@ -86,7 +86,7 @@ class Shells private constructor(private val style: Int, private val coat: Coat)
      * Calls [.setLocation] and [.setSize] in one line.
      */
     fun setRectangle(rect: Rectangle): Shells {
-        return setLocation(Point(rect.x, rect.y)).setSize(Point(rect.width, rect.height))
+        return setLocation(SwtKt.Point(rect.x, rect.y)).setSize(SwtKt.Point(rect.width, rect.height))
     }
 
     /**
@@ -290,12 +290,12 @@ class Shells private constructor(private val style: Int, private val coat: Coat)
                     }
                 }
                 val topLeft =
-                    location!!.key.topLeftRequiredFor(Rectangle(0, 0, computedSize.x, computedSize.y), location!!.value)
-                bounds = Rectangle(topLeft.x, topLeft.y, computedSize.x, computedSize.y)
+                    location!!.key.topLeftRequiredFor(SwtKt.Rectangle(0, 0, computedSize.x, computedSize.y), location!!.value)
+                bounds = SwtKt.Rectangle(topLeft.x, topLeft.y, computedSize.x, computedSize.y)
             } else {
                 val computedSize = shell.computeSize(size.x, size.y, true)
                 val topLeft =
-                    location!!.key.topLeftRequiredFor(Rectangle(0, 0, computedSize.x, computedSize.y), location!!.value)
+                    location!!.key.topLeftRequiredFor(SwtKt.Rectangle(0, 0, computedSize.x, computedSize.y), location!!.value)
                 bounds = shell.computeTrim(topLeft.x, topLeft.y, computedSize.x, computedSize.y)
             }
         }

durian-swt/src/main/java/com/diffplug/common/swt/SwtKt.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2025 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.common.swt;
+
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+
+public class SwtKt {
+	public static Point Point(int x, int y) {
+		return new Point(x, y);
+	}
+
+	public static Rectangle Rectangle(int x, int y, int width, int height) {
+		return new Rectangle(x, y, width, height);
+	}
+}

durian-swt/src/test/java/com/diffplug/common/swt/Issue_2228.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2025 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.common.swt;
+
+import org.eclipse.jface.layout.GridLayoutFactory;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(InteractiveTest.class)
+public class Issue_2228 {
+	@Test
+	public void recreate() {
+		// testCoat probably takes a title and a lambda that receives the parent Composite
+		InteractiveTest.testCoat(
+				"Show the difference between `.svg` and `@x2.png` rendering", Issue_2228::svg_and_png);
+	}
+
+	private static void svg_and_png(Composite parent) {
+		// two-column grid
+		GridLayoutFactory.swtDefaults().numColumns(2).applyTo(parent);
+
+		// “.svg” label + image
+		Label svgLabel = new Label(parent, SWT.NONE);
+		svgLabel.setText(".svg");
+
+		Label svgImage = new Label(parent, SWT.NONE);
+		ImageDescriptor svgDesc = ImageDescriptor.createFromFile(Issue_2228.class, "/issue_2228/strikethrough.svg");
+		svgImage.setImage(svgDesc.createImage());
+
+		// “.png” label + image
+		Label pngLabel = new Label(parent, SWT.NONE);
+		pngLabel.setText(".png");
+
+		Label pngImage = new Label(parent, SWT.NONE);
+		ImageDescriptor pngDesc = ImageDescriptor.createFromFile(Issue_2228.class, "/issue_2228/strikethrough.png");
+		pngImage.setImage(pngDesc.createImage());
+	}
+
+	public static void main(String[] args) {
+		Display display = Display.getDefault();
+		Shell shell = new Shell(display, SWT.SHELL_TRIM);
+		svg_and_png(shell);
+		shell.open();
+		while (!shell.isDisposed()) {
+			if (!display.readAndDispatch()) {
+				display.sleep();
+			}
+		}
+		display.dispose();
+	}
+}

durian-swt/src/test/resources/issue_2228/strikethrough.png

@@ -16,7 +16,7 @@ VER_DURIAN=1.2.0
 VER_DURIAN_RX=5.0.1
 VER_DURIAN_DEBUG=1.1.0
 # SWT Dependencies from P2
-VER_ECLIPSE_PLATFORM=4.34
+VER_ECLIPSE_PLATFORM=4.37
 VER_ECLIPSE_PLATFORM_X86=4.7
 
 # Testing