Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
31c83fd
Fix for multi-threading issues in AnnotationMap
mehmet-karaman Oct 13, 2025
ec70c28
Allowing smaller images to show in the workbench window
andrew-tram Aug 13, 2025
d63891f
Apply suggestion from @marcushoepfner
andrew-tram Sep 8, 2025
53e463e
Update StackRenderer.java
andrew-tram Sep 8, 2025
3c7103d
Update MANIFEST.MF
andrew-tram Dec 1, 2025
3b50d7f
Merge branch 'master' into master
andrew-tram Jan 5, 2026
8c58914
Test MultiPageEditorPart contracts in FormEditor #3764
basilevs Mar 7, 2026
8007e93
Add result count to Find/Replace overlay
elsazac Jun 2, 2026
998dac9
Use OSGI tracing and debug options handling in org.eclipse.ui.workbench
trancexpress May 30, 2026
8e8602f
Fix selection not updating when checking a tree item on Windows
tuanvtdeptre199 Jun 11, 2026
559f16a
Fix 1
tuanvtdeptre199 Jun 12, 2026
d6555f3
optional autocomplete support in chevron pop up
elsazac Sep 25, 2025
e400d77
Show proper symlink decorations for broken symlinks
iloveeclipse Jul 3, 2026
7085a39
Offer to open/show existing project from Smart Import wizard
deepika-u Jul 8, 2026
51eb713
Add expand/collapse hover option in Search Results tree view
elsazac Aug 30, 2026
ff39558
Version bump(s) for 4.42 stream
eclipse-platform-bot Aug 31, 2026
a62f72a
Show Open/Close Project for mixed selections in Project Explorer
vogella Sep 22, 2026
a8d3892
Count distinct files across the complete CompositeChange tree
carstenartur Sep 12, 2026
0db9d4d
Fix duplicate page registration in FormEditor.addPage(IFormPage)
goutamadwant Sep 27, 2026
58f2edd
Add preference to render detached windows as top level shells
RoiSoleil Oct 5, 2026
d18b5d7
Update project explorer tree view when projects are added/removed.
nettozahler Oct 8, 2026
d4345b9
Fix regex Replace All rematching line-start anchors
Ares16x16 Sep 11, 2026
66171aa
test: drop zero-length ^ Replace All case (unsupported by adapter)
Ares16x16 Sep 12, 2026
22dff87
fix: drop unreachable guard around match re-selection
Ares16x16 Sep 17, 2026
11ab764
Document why the match is re-selected before each replacement
Ares16x16 Sep 17, 2026
9fac351
Replace hamcrest usage with JUnit 5 assertions
HeikoKlare Oct 5, 2026
661d76b
Migrate OpenCloseWindowTest and OpenClosePerspectiveTest to JUnit5 #3639
ravnskjaer Oct 15, 2026
6d40989
Restore lines visibility of trees and tables on theme reset
vogella Oct 18, 2026
2829536
WizardDialog resizes itself in an endless loop after a DPI change ecl…
astrograph Oct 2, 2026
bb9c080
Find/Replace: replace the selected match instead of the last found one
vlakn Oct 23, 2026
ad19908
Add auto-incrementing counter placeholder to Find/Replace #3842
shardt68 Oct 31, 2026
18fb92d
Rebuild the Section title bar image when its colors change
vogella Nov 1, 2026
88070a9
Show pinned editors first in chevron and Ctrl+E when enabled
deepika-u Oct 7, 2026
6612d04
Set the SVG currentColor from the CSS theme at startup
vogella Oct 14, 2026
5702c8a
Sort by the undecorated label of styled decorating label providers
astrograph Oct 21, 2026
2bc9e8b
Recompute indent folding regions when folding is re-enabled
vogella Nov 6, 2026
e80a3e9
CodeMinings: Add support for rendering placeholder while resolving #3723
flori-schwa Oct 16, 2026
20f95fa
Prevent reentrant part activation cycles causing UI freezes
tobiasmelcher Nov 6, 2026
4c95ade
Draw a light border around the split editor area in the macOS theme
HeikoKlare Nov 9, 2026
ec474c4
Ignore focus changes while a part is being activated
vogella Nov 5, 2026
60aa35a
Make sorting in FilteredList and TwoPaneElementSelector stable
deepika-u Oct 27, 2026
1099295
Place the editor onboarding area in the folder's client area
HeikoKlare Nov 10, 2026
8510b6e
Re-apply CSS colors that only match the inherited color
vogella Oct 16, 2026
25e7c3d
Add quick selection mode to the e4 FilteredTree
vogella Oct 14, 2026
4bd8b48
Set the dark theme preference before resetting widget colors
vogella Nov 10, 2026
e13570b
Show theme controls dynamically on the Appearance preference page
nburnwal09 Oct 26, 2026
2cc8469
Return views outside of perspectives from getViewReferences()
ravnskjaer Nov 7, 2026
116da67
Add bookmark feature for resources in eclipse explorers
elsazac Sep 23, 2026
6205f1b
Do not block the UI thread on the workspace lock when opening a match
fedejeanne Nov 12, 2026
3c65f7d
Keep valid code minings visible when a provider supplies an invalid p…
tobiasmelcher Nov 11, 2026
860c3fb
Provide reusable breadcrumb viewer implementations in JFace #4495
LukasHackl2 Nov 8, 2026
e8ee5fb
Add support for image zooming inside editor
deepika-u Nov 6, 2026
747d2bb
Keep the horizontal scroll position when the text viewer redraws again
gerdleon Nov 12, 2026
7209f73
Fold up3169 into the superset
hsoliwal Nov 16, 2026
e09c9aa
Fold up3336 into the superset
hsoliwal Nov 16, 2026
9ecf1f9
Fold up3397 into the superset
hsoliwal Nov 16, 2026
b896430
Fold up3765 into the superset
hsoliwal Nov 16, 2026
dd61634
Fold up3843 into the superset
hsoliwal Nov 16, 2026
126a754
Fold up4037 into the superset
hsoliwal Nov 16, 2026
1cbd237
Fold up4050 into the superset
hsoliwal Nov 16, 2026
da3ab5a
Fold up4084 into the superset
hsoliwal Nov 16, 2026
6ce7399
Fold up4158 into the superset
hsoliwal Nov 16, 2026
c52969b
Fold up4373 into the superset
hsoliwal Nov 16, 2026
775bc2f
Fold up4382 into the superset
hsoliwal Nov 16, 2026
0f8b151
Fold up4398 into the superset
hsoliwal Nov 16, 2026
a2d2c0a
Fold up4406 into the superset
hsoliwal Nov 16, 2026
d537b39
Fold up4414 into the superset
hsoliwal Nov 16, 2026
135c82f
Fold up4428 into the superset
hsoliwal Nov 16, 2026
857ce39
Fold up4437 into the superset
hsoliwal Nov 16, 2026
95d4858
Fold up4450 into the superset
hsoliwal Nov 16, 2026
d9cb738
Fold up4461 into the superset
hsoliwal Nov 16, 2026
2c5d47f
Fold up4493 into the superset
hsoliwal Nov 16, 2026
5cf1c67
Fold up4494 into the superset
hsoliwal Nov 16, 2026
e37f25b
Fold up4496 into the superset
hsoliwal Nov 16, 2026
fe9d65a
Fold up4497 into the superset
hsoliwal Nov 16, 2026
235a22c
Fold up4499 into the superset
hsoliwal Nov 16, 2026
59b62e8
Fold up4508 into the superset
hsoliwal Nov 16, 2026
8fd9ee4
Fold up4513 into the superset
hsoliwal Nov 16, 2026
05d1725
Fold up4520 into the superset
hsoliwal Nov 16, 2026
6dc832b
Fold up4523 into the superset
hsoliwal Nov 16, 2026
ae223fa
Fold up4526 into the superset
hsoliwal Nov 16, 2026
718441f
Fold up4529 into the superset
hsoliwal Nov 16, 2026
82346ef
Fold up4532 into the superset
hsoliwal Nov 16, 2026
aa5dbe2
Fold up4543 into the superset
hsoliwal Nov 16, 2026
c55ffb0
Fold up4545 into the superset
hsoliwal Nov 16, 2026
1264ea7
Fold up4548 into the superset
hsoliwal Nov 16, 2026
aabfaf0
Fold up4554 into the superset
hsoliwal Nov 16, 2026
8eb61ec
Fold up4557 into the superset
hsoliwal Nov 16, 2026
25e5e96
Fold up4558 into the superset
hsoliwal Nov 16, 2026
d7a356c
Fold up4559 into the superset
hsoliwal Nov 16, 2026
03c5749
Fold up4563 into the superset
hsoliwal Nov 16, 2026
f32f121
Fold up4564 into the superset
hsoliwal Nov 16, 2026
c3352c5
Fold up4170 into the superset
hsoliwal Nov 16, 2026
ddb5db1
Fold up4318 into the superset
hsoliwal Nov 16, 2026
17fa0d5
Fold up4517 into the superset
hsoliwal Nov 16, 2026
97ad421
Fold up4556 into the superset
hsoliwal Nov 16, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-21
Require-Bundle: org.eclipse.swt;bundle-version="[3.134.0,4.0.0)",
org.eclipse.e4.ui.css.swt;bundle-version="0.13.100",
org.eclipse.e4.ui.css.swt;bundle-version="0.17.200",
org.eclipse.e4.ui.css.core;bundle-version="0.12.200",
org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)"
Bundle-ActivationPolicy: lazy
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2010, 2023 Tom Schindl and others.
* Copyright (c) 2010, 2026 Tom Schindl and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand Down Expand Up @@ -54,8 +54,10 @@
import org.eclipse.e4.ui.css.core.util.impl.resources.OSGiResourceLocator;
import org.eclipse.e4.ui.css.core.util.resources.IResourceLocator;
import org.eclipse.e4.ui.css.swt.helpers.EclipsePreferencesHelper;
import org.eclipse.e4.ui.css.swt.properties.custom.CSSPropertySVGCurrentColorHandler;
import org.eclipse.e4.ui.css.swt.theme.ITheme;
import org.eclipse.e4.ui.css.swt.theme.IThemeEngine;
import org.eclipse.e4.ui.css.swt.theme.ThemeDefinition;
import org.eclipse.osgi.service.datalocation.Location;
import org.eclipse.swt.widgets.Display;
import org.osgi.framework.Bundle;
Expand Down Expand Up @@ -128,76 +130,40 @@ public ThemeEngine(Display display) {
}

File[] modifiedFiles = modDir.listFiles();
String currentOS = Platform.getOS();
boolean e4_dark_mac_found = false;

for (IExtension e : extPoint.getExtensions()) {
for (IConfigurationElement ce : getPlatformMatches(e.getConfigurationElements())) {
if (ce.getName().equals("theme")) {
try {
String id = ce.getAttribute("id");
String os = ce.getAttribute("os");
String version = ce.getAttribute("os_version");

/*
* Code to support e4 dark theme on Mac 10.13 and older. For e4 dark theme on
* Mac, register the theme with matching OS version if specified.
*/
if (E4_DARK_THEME_ID.equals(id) && Platform.OS_MACOSX.equals(currentOS) && os != null
&& os.equals(currentOS)) {
// If e4 dark theme on Mac was already registered, don't try to match or
// register again.
if (e4_dark_mac_found) {
continue;
}
if (version != null && !isOsVersionMatch(version)) {
continue;
} else {
e4_dark_mac_found = true;
version = "";
}
}

if (version == null) {
version = "";
}

final String themeBaseId = id + version;
String themeId = themeBaseId;
String label = ce.getAttribute("label");
boolean dark = isDarkTheme(ce);
String originalCSSFile;
String basestylesheeturi = originalCSSFile = ce.getAttribute("basestylesheeturi");
if (!basestylesheeturi.startsWith("platform:/plugin/")) {
basestylesheeturi = "platform:/plugin/" + ce.getContributor().getName() + "/"
+ basestylesheeturi;
}
registerTheme(themeId, label, basestylesheeturi, version, dark);

//check for modified files
if (modifiedFiles != null) {
int slash = originalCSSFile.lastIndexOf('/');
if (slash != -1) {
originalCSSFile = originalCSSFile.substring(slash + 1);
for (File modifiedFile : modifiedFiles) {
String modifiedFileName = modifiedFile.getName();
if (modifiedFileName.contains(".css") && modifiedFileName.equals(originalCSSFile)) { //$NON-NLS-1$
ArrayList<String> styleSheets = new ArrayList<>();
styleSheets.add(modifiedFile.toURI().toString());
modifiedStylesheets.put(themeId, styleSheets);
}
}
for (ThemeDefinition definition : ThemeDefinition.readAll()) {
try {
String themeId = definition.id();
String originalCSSFile = definition.stylesheet();
String basestylesheeturi = originalCSSFile;
if (!basestylesheeturi.startsWith("platform:/plugin/")) {
basestylesheeturi = "platform:/plugin/" + definition.contributor() + "/" + basestylesheeturi;
}
registerTheme(themeId, definition.label(), basestylesheeturi, definition.osVersion(),
definition.dark());

//check for modified files
if (modifiedFiles != null) {
int slash = originalCSSFile.lastIndexOf('/');
if (slash != -1) {
originalCSSFile = originalCSSFile.substring(slash + 1);
for (File modifiedFile : modifiedFiles) {
String modifiedFileName = modifiedFile.getName();
if (modifiedFileName.contains(".css") && modifiedFileName.equals(originalCSSFile)) { //$NON-NLS-1$
ArrayList<String> styleSheets = new ArrayList<>();
styleSheets.add(modifiedFile.toURI().toString());
modifiedStylesheets.put(themeId, styleSheets);
}
}
} catch (IllegalArgumentException e1) {
ThemeEngineManager.logError(e1.getMessage(), e1);
}
}
} catch (IllegalArgumentException e1) {
ThemeEngineManager.logError(e1.getMessage(), e1);
}
}

for (IExtension e : extPoint.getExtensions()) {
for (IConfigurationElement ce : getPlatformMatches(e.getConfigurationElements())) {
for (IConfigurationElement ce : ThemeDefinition.getPlatformMatches(e.getConfigurationElements())) {
if (ce.getName().equals("stylesheet")) {
IConfigurationElement[] cces = ce.getChildren("themeid");
if (cces.length == 0) {
Expand Down Expand Up @@ -243,39 +209,6 @@ public ThemeEngine(Display display) {
}


/**
* Themes declare their appearance with the {@code isDarkTheme} attribute. Themes
* contributed before that attribute existed are classified by their id, which is
* the convention the platform relied on so far.
*/
private static boolean isDarkTheme(IConfigurationElement themeElement) {
String dark = themeElement.getAttribute("isDarkTheme");
if (dark != null) {
return Boolean.parseBoolean(dark);
}
String id = themeElement.getAttribute("id");
return id != null && id.contains("dark"); //$NON-NLS-1$
}

private boolean isOsVersionMatch(String osVersionList) {
boolean found = false;
String osVersion = System.getProperty("os.version");
if (osVersion != null) {
if (osVersionList != null) {
String[] osVersions = osVersionList.split(","); //$NON-NLS-1$
for (String osVersionFromTheme : osVersions) {
if (osVersionFromTheme != null) {
if (osVersion.contains(osVersionFromTheme)) {
found = true;
break;
}
}
}
}
}
return found;
}

@Override
public synchronized ITheme registerTheme(String id, String label, String basestylesheetURI)
throws IllegalArgumentException {
Expand Down Expand Up @@ -401,31 +334,6 @@ private List<IResourceLocator> getResourceLocators(String id) {
return list;
}

/**
* Get all elements that have os/ws attributes that best match the current
* platform.
*
* @param elements the elements to check
* @return the best matches, if any
*/
private IConfigurationElement[] getPlatformMatches(IConfigurationElement[] elements) {
Bundle bundle = FrameworkUtil.getBundle(ThemeEngine.class);
String osname = bundle.getBundleContext().getProperty("osgi.os");
// TODO: Need to differentiate win32 versions
String wsname = bundle.getBundleContext().getProperty("osgi.ws");
ArrayList<IConfigurationElement> matchingElements = new ArrayList<>();
for (IConfigurationElement element : elements) {
String elementOs = element.getAttribute("os");
String elementWs = element.getAttribute("ws");
if (osname != null && (elementOs == null || elementOs.contains(osname))) {
matchingElements.add(element);
} else if (wsname != null && wsname.equalsIgnoreCase(elementWs)) {
matchingElements.add(element);
}
}
return matchingElements.toArray(new IConfigurationElement[matchingElements.size()]);
}

@Override
public void setTheme(String themeId, boolean restore) {
if (applyTheme(themeId, restore)) {
Expand All @@ -434,12 +342,12 @@ public void setTheme(String themeId, boolean restore) {
// In OS high-contrast mode keep the native OS colors instead of forcing a theme
if (display != null && display.getHighContrast()) {
ILog.of(ThemeEngine.class)
.warn("Theme '" + themeId + "' not found; using OS high contrast colors."); //$NON-NLS-1$ //$NON-NLS-2$
.warn("Theme '" + themeId + "' not found; using OS high contrast colors."); //$NON-NLS-1$ //$NON-NLS-2$
return;
}
if (!E4_DEFAULT_THEME_ID.equals(themeId) && applyTheme(E4_DEFAULT_THEME_ID, restore)) {
ILog.of(ThemeEngine.class)
.warn("Theme '" + themeId + "' not found; falling back to default theme."); //$NON-NLS-1$ //$NON-NLS-2$
.warn("Theme '" + themeId + "' not found; falling back to default theme."); //$NON-NLS-1$ //$NON-NLS-2$
return;
}
ILog.of(ThemeEngine.class).warn("Theme '" + themeId + "' not found."); //$NON-NLS-1$ //$NON-NLS-2$
Expand Down Expand Up @@ -487,6 +395,9 @@ public void setTheme(ITheme theme, boolean restore) {
public void setTheme(ITheme theme, boolean restore, boolean force) {
Assert.isNotNull(theme, "The theme must not be null");

// on GTK a reset resolves null colors against the system colors, which must match the new theme
display.setDarkThemePreferred(theme.isDark());

if (this.currentTheme != theme || force) {
if (currentTheme != null) {
for (IResourceLocator l : getResourceLocators(currentTheme
Expand All @@ -498,6 +409,10 @@ public void setTheme(ITheme theme, boolean restore, boolean force) {
}
}

if (currentTheme != null && !currentTheme.getId().equals(theme.getId())) {
// icons already rasterized keep their color, so only a restart may change it
CSSPropertySVGCurrentColorHandler.freeze();
}
this.currentTheme = theme;
for (CSSEngine engine : cssEngines) {
engine.reset();
Expand Down Expand Up @@ -551,8 +466,6 @@ public void setTheme(ITheme theme, boolean restore, boolean force) {
}
publishEffectiveThemeId();

display.setDarkThemePreferred(theme.isDark());

sendThemeChangeEvent(restore);

for (CSSEngine engine : cssEngines) {
Expand Down
Loading