Merge changes to my fork

.github/workflows/build.yml

@@ -28,6 +28,15 @@ on:
         type: boolean
         required: false
         default: false
+      api_check:
+        description: |
+          Run the API tools check and generate the javadoc (one of true, false)
+
+          Both only depend on the Java sources, so enable this for a single job
+          per operating system.
+        type: boolean
+        required: false
+        default: false
       gtk:
         description: |
           (Required on Linux only) GTK version to use (one of gtk3, gtk4)
@@ -108,7 +117,7 @@ jobs:
         --threads 1C
         -DforkCount=1
         '-Dnative=${{ inputs.native }}'
-        -Papi-check -Pjavadoc
+        ${{ inputs.api_check && '-Papi-check -Pjavadoc' || '' }}
         '-Dtycho.baseline.replace=none'
         --fail-at-end
         -DskipNativeTests=false

.github/workflows/maven.yml

@@ -48,7 +48,7 @@ jobs:
     steps:
       - name: Paths filter (PRs only)
         if: github.event.pull_request.base
-        uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2
+        uses: dorny/paths-filter@ceb8a2b8f2d89434be7ff52d3de7ec3738c5cc9d # v4.0.3
         id: filter
         with:
           predicate-quantifier: 'every'
@@ -93,6 +93,8 @@ jobs:
       native: gtk.linux.x86_64
       gtk: ${{ matrix.gtk }}
       gdk_backend: ${{ matrix.gdk_backend }}
+      # All Linux jobs build the same Java sources, so check the API and javadoc only once
+      api_check: ${{ matrix.gtk == 'gtk3' && matrix.gdk_backend == 'x11' }}
       performance: ${{ contains(github.event.pull_request.labels.*.name, 'performance') }}
       runtodotests: ${{ contains(github.event.pull_request.labels.*.name, 'runtodotests') }}
 
@@ -110,6 +112,7 @@ jobs:
       runner: windows-latest
       java: ${{ matrix.java }}
       native: win32.win32.x86_64
+      api_check: true
       performance: ${{ contains(github.event.pull_request.labels.*.name, 'performance') }}
       runtodotests: ${{ contains(github.event.pull_request.labels.*.name, 'runtodotests') }}
 
@@ -128,5 +131,7 @@ jobs:
       runner: ${{ matrix.arch == 'x86_64' && 'macos-15-intel' || 'macos-latest' }}
       java: ${{ matrix.java }}
       native: cocoa.macosx.${{ matrix.arch }}
+      # Both macOS fragments compile the same Java sources, so check the API and javadoc only once
+      api_check: ${{ matrix.arch == 'aarch64' }}
       performance: ${{ contains(github.event.pull_request.labels.*.name, 'performance') }}
       runtodotests: ${{ contains(github.event.pull_request.labels.*.name, 'runtodotests') }}

Jenkinsfile

@@ -21,10 +21,10 @@ def runOnNativeBuildAgent(String platform, Closure body) {
 	def dockerImage = null
 	switch (platform) {
 		case 'gtk.linux.x86_64':
-			dockerImage = 'eclipse/platformreleng-debian-swtgtk3nativebuild:10'
+			dockerImage = 'ghcr.io/eclipse-platform/platformreleng-debian-swtgtk3nativebuild:11'
 			break
 		case 'gtk4.linux.x86_64':
-			dockerImage = 'eclipse/platformreleng-debian-swtnativebuild:12'
+			dockerImage = 'ghcr.io/eclipse-platform/platformreleng-debian-swtnativebuild:12'
 			break
 	}
 	if (dockerImage != null) {

NOTICE

@@ -26,11 +26,7 @@ SPDX-License-Identifier: EPL-2.0
 
 The project maintains the following source code repositories:
 
-* https://github.com/eclipse-platform/eclipse.platform.debug.git
 * https://github.com/eclipse-platform/eclipse.platform.git
 * https://github.com/eclipse-platform/eclipse.platform.releng.aggregator.git
-* https://github.com/eclipse-platform/eclipse.platform.releng.buildtools.git
-* https://github.com/eclipse-platform/eclipse.platform.releng.git
 * https://github.com/eclipse-platform/eclipse.platform.swt.git
-* https://github.com/eclipse-platform/eclipse.platform.ua.git
 * https://github.com/eclipse-platform/eclipse.platform.ui.git

bundles/org.eclipse.swt.tools/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-SymbolicName: org.eclipse.swt.tools; singleton:=true
-Bundle-Version: 3.112.0.qualifier
+Bundle-Version: 3.112.100.qualifier
 Bundle-ManifestVersion: 2
 Export-Package: org.eclipse.swt.tools.internal; x-internal:=true
 Bundle-ActivationPolicy: lazy

bundles/org.eclipse.swt.tools/Mac Generation/org/eclipse/swt/tools/internal/MacGenerator.java

@@ -982,6 +982,8 @@ public String[] getExtraAttributeNames(Node node) {
 		}
 	} else if (name.equals("class")) {
 		return new String[]{"swt_superclass"};
+	} else if (name.equals("enum")) {
+		return new String[]{"swt_value_aarch64"};
 	} else if (name.equals("struct")) {
 		return new String[]{"swt_gen_memmove", "swt_gen_tostring"};
 	} else if (name.equals("retval")) {
@@ -1147,10 +1149,10 @@ void generateEnums() {
 						if (value.indexOf('.') != -1) {
 							out("double ");
 						} else {
-							if (value.equals("4294967295")) {
+							if (isUint32Max(value)) {
 								out("int ");
 								value = "-1";
-							} else if (value.equals("18446744073709551615")) {
+							} else if (isUint64Max(value)) {
 								out("long ");
 								value = "-1L";
 							} else {
@@ -1165,8 +1167,20 @@ void generateEnums() {
 						}
 						out(attributes.getNamedItem("name").getNodeValue());
 						out(" = ");
-						out(value);
-						if (isLong && !value.endsWith("L")) out("L");
+						Node aarch64ValueNode = attributes.getNamedItem("swt_value_aarch64");
+						if (aarch64ValueNode != null) {
+							out("IS_X86_64 ? ");
+							out(value);
+							if (isLong && !value.endsWith("L")) out("L");
+							out(" : ");
+							String aarch64Value = aarch64ValueNode.getNodeValue();
+							aarch64Value = isUint32Max(aarch64Value) ? "-1" : isUint64Max(aarch64Value) ? "-1L" : aarch64Value;
+							out(aarch64Value);
+							if (isLong && !aarch64Value.endsWith("L")) out("L");
+						} else {
+							out(value);
+							if (isLong && !value.endsWith("L")) out("L");
+						}
 						out(";");
 						outln();
 					} else {
@@ -1178,6 +1192,17 @@ void generateEnums() {
 	}
 }
 
+private static final String UINT32_MAX = "4294967295";
+private static final String UINT64_MAX = "18446744073709551615";
+
+private boolean isUint32Max(String value) {
+	return value.equals(UINT32_MAX);
+}
+
+private boolean isUint64Max(String value) {
+	return value.equals(UINT64_MAX);
+}
+
 boolean getGen(Node node) {
 	NamedNodeMap attributes = node.getAttributes();
 	if (attributes == null) return false;

bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java

@@ -172,6 +172,7 @@ public class CTabFolder extends Composite {
 	int[] priority = new int[0];
 	boolean mru = false;
 	Listener listener;
+	Listener tabControlZoomListener;
 	boolean ignoreTraverse;
 	boolean useDefaultRenderer;
 
@@ -345,6 +346,10 @@ void init(int style) {
 		}
 	};
 
+	// A tab control is rescaled after the folder itself, so its size can only be
+	// measured reliably once it has processed the zoom change on its own.
+	tabControlZoomListener = event -> updateFolder(UPDATE_TAB_HEIGHT | REDRAW);
+
 	int[] folderEvents = new int[]{
 		SWT.Dispose,
 		SWT.DragDetect,
@@ -2057,6 +2062,8 @@ void onPageTraversal(Event event) {
 					if (e.doit && !isDisposed()) {
 						showList(chevronRect);
 					}
+				} else {
+					index = visible [(current + offset + idx) % idx];
 				}
 			}
 		}
@@ -4184,6 +4191,7 @@ void addTabControl(Control control, int flags, int index, boolean update) {
 	int length = controls.length;
 
 	control.addListener(SWT.Resize, listener);
+	control.addListener(SWT.ZoomChanged, tabControlZoomListener);
 
 	//Grow all 4 arrays
 	Control[] newControls = new Control [length + 1];
@@ -4245,6 +4253,7 @@ void removeTabControl (Control control, boolean update) {
 
 	if (!control.isDisposed()) {
 		control.removeListener(SWT.Resize, listener);
+		control.removeListener(SWT.ZoomChanged, tabControlZoomListener);
 		control.setBackground (null);
 		control.setBackgroundImage (null);
 		if (control instanceof Composite) ((Composite) control).setBackgroundMode(SWT.INHERIT_NONE);

bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DropTarget.java

@@ -575,7 +575,7 @@ int getOperationFromKeyState() {
 	if (currEvent != null) {
 		long modifiers = currEvent.modifierFlags();
 		boolean option = (modifiers & OS.NSAlternateKeyMask) == OS.NSAlternateKeyMask;
-		boolean control = (modifiers & OS.NSControlKeyMask) == OS.NSControlKeyMask;
+		boolean control = (modifiers & OS.NSEventModifierFlagControl) == OS.NSEventModifierFlagControl;
 		if (control && option) return DND.DROP_DEFAULT;
 		if (control) return DND.DROP_LINK;
 		if (option) return DND.DROP_COPY;