Skip to content

Commit 87f78a8

Browse files
killingermkillingerm
committed
Merge branch 'icon-disabling' of https://github.com/killingerm/eclipse.platform.swt into icon-disabling
2 parents 2c19d8f + 95dc5d5 commit 87f78a8

File tree

110 files changed

+890
-750
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+890
-750
lines changed

‎.github/workflows/maven.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
--threads 1C
7373
-DforkCount=1
7474
'-Dnative=${{ matrix.config.native }}'
75-
-Papi-check
75+
-Papi-check -Pjavadoc
7676
'-Dtycho.baseline.replace=none'
7777
--fail-at-end
7878
-DskipNativeTests=false

‎Jenkinsfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def getNativeJdkUrl(String os, String arch) { // To update the used JDK version
7171
}
7272

7373
def getLatestGitTag() {
74-
return sh(script: 'git describe --abbrev=0 --tags --match v[0-9][0-9][0-9][0-9]*', returnStdout: true).strip()
74+
return sh(script: 'git describe --abbrev=0 --tags --match v[0-9][0-9][0-9][0-9]*', returnStdout: true).trim()
7575
}
7676

7777
def getSWTVersions() { // must be called from the repository root
@@ -159,7 +159,7 @@ pipeline {
159159
def sources = sourceFoldersProps.collectEntries{ k, src -> [ k, src.split(',').collect{ f -> '\'' + f + '\''}.join(' ') ] }
160160
for(ws in allWS) {
161161
def diff = sh(script: "git diff HEAD ${swtTag} ${sources.src_common} ${sources['src_' + ws]}", returnStdout: true)
162-
if (!diff.strip().isEmpty()) {
162+
if (!diff.trim().isEmpty()) {
163163
NATIVES_CHANGED += ws
164164
}
165165
}
@@ -351,7 +351,7 @@ pipeline {
351351
sh '''
352352
mvn clean verify \
353353
--batch-mode --threads 1C -V -U -e -DforkCount=0 \
354-
-Papi-check \
354+
-Pbree-libs -Papi-check -Pjavadoc \
355355
-Dcompare-version-with-baselines.skip=false \
356356
-Dorg.eclipse.swt.tests.junit.disable.test_isLocal=true \
357357
-Dmaven.test.failure.ignore=true -Dmaven.test.error.ignore=true

‎binaries/pom.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,24 @@
8383
</archive>
8484
</configuration>
8585
</plugin>
86+
<plugin>
87+
<groupId>org.apache.maven.plugins</groupId>
88+
<artifactId>maven-javadoc-plugin</artifactId>
89+
<configuration>
90+
<tags combine.children="append">
91+
<tag>
92+
<name>field</name>
93+
<placement>f</placement>
94+
<head>Native field</head>
95+
</tag>
96+
<tag>
97+
<name>method</name>
98+
<placement>m</placement>
99+
<head>Native method</head>
100+
</tag>
101+
</tags>
102+
</configuration>
103+
</plugin>
86104
</plugins>
87105
</build>
88106

‎bundles/org.eclipse.swt.svg/META-INF/p2.inf‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# ensure that the applicable implementation fragment gets installed (https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/3006)
2+
requires.1.namespace = org.eclipse.equinox.p2.iu
3+
requires.1.name = org.eclipse.swt.win32.win32.x86_64
4+
requires.1.filter = (&(osgi.os=win32)(osgi.ws=win32)(osgi.arch=x86_64))
5+
6+
requires.2.namespace = org.eclipse.equinox.p2.iu
7+
requires.2.name = org.eclipse.swt.cocoa.macosx.x86_64
8+
requires.2.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=x86_64))
9+
10+
requires.3.namespace = org.eclipse.equinox.p2.iu
11+
requires.3.name = org.eclipse.swt.gtk.linux.x86_64
12+
requires.3.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86_64))
13+
14+
requires.4.namespace = org.eclipse.equinox.p2.iu
15+
requires.4.name = org.eclipse.swt.gtk.linux.ppc64le
16+
requires.4.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=ppc64le))
17+
18+
requires.5.namespace = org.eclipse.equinox.p2.iu
19+
requires.5.name = org.eclipse.swt.gtk.linux.aarch64
20+
requires.5.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=aarch64))
21+
22+
requires.6.namespace = org.eclipse.equinox.p2.iu
23+
requires.6.name = org.eclipse.swt.cocoa.macosx.aarch64
24+
requires.6.filter = (&(osgi.os=macosx)(osgi.ws=cocoa)(osgi.arch=aarch64))
25+
26+
requires.7.namespace = org.eclipse.equinox.p2.iu
27+
requires.7.name = org.eclipse.swt.win32.win32.aarch64
28+
requires.7.filter = (&(osgi.os=win32)(osgi.ws=win32)(osgi.arch=aarch64))
29+
30+
requires.8.namespace = org.eclipse.equinox.p2.iu
31+
requires.8.name = org.eclipse.swt.gtk.linux.riscv64
32+
requires.8.filter = (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=riscv64))

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,5 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.29.0",
1212
org.eclipse.core.resources;bundle-version="3.4.0",
1313
org.eclipse.jdt.core;bundle-version="3.4.0",
1414
org.eclipse.ui;bundle-version="3.4.0",
15-
org.eclipse.jface.text;bundle-version="3.4.0",
16-
org.eclipse.swt.tools.base;bundle-version="3.106.0";visibility:=reexport,
17-
org.eclipse.swt.tools.spies;bundle-version="3.106.0";visibility:=reexport
15+
org.eclipse.jface.text;bundle-version="3.4.0"
1816
Automatic-Module-Name: org.eclipse.swt.tools

‎bundles/org.eclipse.swt/Eclipse SWT AWT/gtk/org/eclipse/swt/awt/SWT_AWT.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2000, 2019 IBM Corporation and others.
2+
* Copyright (c) 2000, 2025 IBM Corporation and others.
33
*
44
* This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
@@ -231,7 +231,7 @@ public static Frame new_Frame (final Composite parent) {
231231
});
232232
break;
233233
case SWT.Resize:
234-
final Rectangle clientArea = DPIUtil.autoScaleUp(parent.getClientArea());
234+
final Rectangle clientArea = parent.getClientArea();
235235
EventQueue.invokeLater(() -> frame[0].setSize (clientArea.width, clientArea.height));
236236
break;
237237
}
@@ -241,7 +241,7 @@ public static Frame new_Frame (final Composite parent) {
241241

242242
parent.getDisplay().asyncExec(() -> {
243243
if (parent.isDisposed()) return;
244-
final Rectangle clientArea = DPIUtil.autoScaleUp(parent.getClientArea());
244+
final Rectangle clientArea = parent.getClientArea();
245245
EventQueue.invokeLater(() -> {
246246
frame[0].setSize (clientArea.width, clientArea.height);
247247
frame[0].validate ();
@@ -285,7 +285,7 @@ public void componentResized (ComponentEvent e) {
285285
display.syncExec (() -> {
286286
if (shell.isDisposed()) return;
287287
Dimension dim = parent.getSize ();
288-
shell.setSize (DPIUtil.autoScaleDown(new Point(dim.width, dim.height)));
288+
shell.setSize (new Point(dim.width, dim.height));
289289
});
290290
}
291291
};

‎bundles/org.eclipse.swt/Eclipse SWT Accessibility/cocoa/org/eclipse/swt/accessibility/Accessible.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1351,7 +1351,7 @@ public id internal_accessibilityFocusedUIElement(int childID) {
13511351
* You can assume the point has already been determined to lie within the receiver.
13521352
* Override this method to do deeper hit testing within a UIElement - e.g. a NSMatrix
13531353
* would test its cells. The point is bottom-left relative screen coordinates.
1354-
*
1354+
* <p>
13551355
* <b>IMPORTANT:</b> This field is <em>not</em> part of the SWT
13561356
* public API. It is marked public only so that it can be shared
13571357
* within the packages provided by SWT. It is not available on all
@@ -1393,7 +1393,7 @@ public id internal_accessibilityHitTest(NSPoint point, int childID) {
13931393
* Return YES if the UIElement doesn't show up to the outside world -
13941394
* i.e. its parent should return the UIElement's children as its own -
13951395
* cutting the UIElement out. E.g. NSControls are ignored when they are single-celled.
1396-
*
1396+
* <p>
13971397
* <b>IMPORTANT:</b> This field is <em>not</em> part of the SWT
13981398
* public API. It is marked public only so that it can be shared
13991399
* within the packages provided by SWT. It is not available on all
@@ -1422,7 +1422,7 @@ public boolean internal_accessibilityIsIgnored(int childID) {
14221422

14231423
/**
14241424
* Return the array of supported attributes that take parameters.
1425-
*
1425+
* <p>
14261426
* <b>IMPORTANT:</b> This field is <em>not</em> part of the SWT
14271427
* public API. It is marked public only so that it can be shared
14281428
* within the packages provided by SWT. It is not available on all
@@ -1484,7 +1484,7 @@ public NSArray internal_accessibilityParameterizedAttributeNames(int childID) {
14841484

14851485
/**
14861486
* Performs the specified action.
1487-
*
1487+
* <p>
14881488
* <b>IMPORTANT:</b> This field is <em>not</em> part of the SWT
14891489
* public API. It is marked public only so that it can be shared
14901490
* within the packages provided by SWT. It is not available on all
@@ -1530,7 +1530,7 @@ public boolean internal_accessibilityPerformAction(NSString action, int childID)
15301530
/**
15311531
* Set the value of the specified attribute to the given value.
15321532
* Unsupported attributes are ignored.
1533-
*
1533+
* <p>
15341534
* <b>IMPORTANT:</b> This field is <em>not</em> part of the SWT
15351535
* public API. It is marked public only so that it can be shared
15361536
* within the packages provided by SWT. It is not available on all

‎bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4534,10 +4534,8 @@ static long toDisplay (long gdkResource, long x, long y) {
45344534
} else {
45354535
GDK.gdk_window_get_origin (gdkResource, origin_x, origin_y);
45364536
}
4537-
int scaledX = DPIUtil.autoScaleDown (origin_x [0]);
4538-
int scaledY = DPIUtil.autoScaleDown (origin_y [0]);
4539-
C.memmove (x, new int[] {scaledX}, 4);
4540-
C.memmove (y, new int[] {scaledY}, 4);
4537+
C.memmove (x, new int[] {origin_x [0]}, 4);
4538+
C.memmove (y, new int[] {origin_y [0]}, 4);
45414539
return 0;
45424540
}
45434541

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2000, 2018 IBM Corporation and others.
2+
* Copyright (c) 2000, 2025 IBM Corporation and others.
33
*
44
* This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
@@ -792,7 +792,7 @@ boolean setEventData(long context, int x, int y, int time, DNDEvent event) {
792792
long window = GTK3.gtk_widget_get_window (control.handle);
793793
GDK.gdk_window_get_origin(window, origin_x, origin_y);
794794
}
795-
Point coordinates = DPIUtil.autoScaleDown(new Point(origin_x[0] + x, origin_y[0] + y));
795+
Point coordinates = new Point(origin_x[0] + x, origin_y[0] + y);
796796

797797
event.widget = this;
798798
event.x = coordinates.x;

‎bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/TableDropTargetEffect.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2000, 2017 IBM Corporation and others.
2+
* Copyright (c) 2000, 2025 IBM Corporation and others.
33
*
44
* This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
@@ -136,7 +136,7 @@ public void dragOver(DropTargetEvent event) {
136136
long handle = table.handle;
137137
int effect = checkEffect(event.feedback);
138138
Point coordinates = new Point(event.x, event.y);
139-
coordinates = DPIUtil.autoScaleUp(table.toControl(coordinates));
139+
coordinates = table.toControl(coordinates);
140140
long [] path = new long [1];
141141
GTK.gtk_tree_view_get_path_at_pos (handle, coordinates.x, coordinates.y, path, null, null, null);
142142
int index = -1;
@@ -154,7 +154,7 @@ public void dragOver(DropTargetEvent event) {
154154
} else {
155155
if (index != -1 && scrollIndex == index && scrollBeginTime != 0) {
156156
if (System.currentTimeMillis() >= scrollBeginTime) {
157-
if (coordinates.y < DPIUtil.autoScaleUp(table.getItemHeight())) {
157+
if (coordinates.y < table.getItemHeight()) {
158158
GTK.gtk_tree_path_prev(path[0]);
159159
} else {
160160
GTK.gtk_tree_path_next(path[0]);

0 commit comments

Comments
 (0)