diff options
| author | Andrey Loskutov | 2017-05-22 09:56:56 +0000 |
|---|---|---|
| committer | Andrey Loskutov | 2017-07-10 08:07:53 +0000 |
| commit | 1e9eac6cbb727fa7812d7bc7442639c71bff3baa (patch) | |
| tree | 0658a29e800b7a627b13497d6bba4c54ab4f2ec6 | |
| parent | 0db8b78835077f16b96586fa7d979fc6439e937a (diff) | |
| download | eclipse.platform.ui-1e9eac6cbb727fa7812d7bc7442639c71bff3baa.tar.gz eclipse.platform.ui-1e9eac6cbb727fa7812d7bc7442639c71bff3baa.tar.xz eclipse.platform.ui-1e9eac6cbb727fa7812d7bc7442639c71bff3baa.zip | |
Bug 516998 - init CSS styling preference at right time
Change-Id: I8ed7e7dff92fa39ef4e9470fbdff521041235bbf
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
(cherry picked from commit f99fdbb51d2ec28593b3a000da580d46f3b58965)
| -rw-r--r-- | bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/PartRenderingEngine.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/PartRenderingEngine.java b/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/PartRenderingEngine.java index 01c32c0e855..81ead0d4dd2 100644 --- a/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/PartRenderingEngine.java +++ b/bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/PartRenderingEngine.java @@ -116,7 +116,6 @@ public class PartRenderingEngine implements IPresentationEngine { public static final String ENABLED_THEME_KEY = "themeEnabled"; - private static boolean enableThemePreference = true; private String factoryUrl; IRendererFactory curFactory = null; @@ -494,10 +493,6 @@ public class PartRenderingEngine implements IPresentationEngine { curFactory = factory; context.set(IRendererFactory.class, curFactory); - IScopeContext[] contexts = new IScopeContext[] { DefaultScope.INSTANCE, InstanceScope.INSTANCE}; - enableThemePreference = Platform.getPreferencesService().getBoolean("org.eclipse.e4.ui.workbench.renderers.swt", - ENABLED_THEME_KEY, true, contexts); - cssThemeChangedHandler = new StylingPreferencesHandler(context.get(Display.class)); } @@ -1254,6 +1249,11 @@ public class PartRenderingEngine implements IPresentationEngine { IEclipseContext appContext) { String cssTheme = (String) appContext.get(E4Application.THEME_ID); String cssURI = (String) appContext.get(IWorkbench.CSS_URI_ARG); + + IScopeContext[] contexts = new IScopeContext[] { DefaultScope.INSTANCE, InstanceScope.INSTANCE }; + boolean enableThemePreference = Platform.getPreferencesService() + .getBoolean("org.eclipse.e4.ui.workbench.renderers.swt", ENABLED_THEME_KEY, true, contexts); + if ("none".equals(cssTheme) || (!enableThemePreference)) { appContext.set(IStylingEngine.SERVICE_NAME, new IStylingEngine() { @Override |