Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 @@ -430,7 +430,12 @@ public void setTheme(String themeId, boolean restore) {
return;
}
}
// Theme not found (e.g. it was uninstalled); fall back to default
// 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$
return;
}
ILog.of(ThemeEngine.class)
.warn("Theme '" + themeId + "' not found; falling back to default theme."); //$NON-NLS-1$ //$NON-NLS-2$
if (!E4_DEFAULT_THEME_ID.equals(themeId)) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.e4.ui.workbench.swt;singleton:=true
Bundle-Version: 0.18.100.qualifier
Bundle-Version: 0.18.200.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -324,8 +324,8 @@ private void setCSSContextVariables(IApplicationContext applicationContext, IEcl
context.set(E4Application.THEME_ID, DEFAULT_THEME_ID);
}
} else {
// Check if user has overridden the branding/command-line theme
String userThemeId = getProductScopedThemeId();
// Do not let a product/workspace default override the OS high-contrast theme
String userThemeId = highContrastMode ? null : getProductScopedThemeId();
if (userThemeId != null) {
context.set(E4Application.THEME_ID, userThemeId);
} else {
Expand Down
Loading