aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Schindl2014-05-09 05:26:34 (EDT)
committerTom Schindl2014-05-09 05:26:34 (EDT)
commitd9049e285f2a3e0fe24ac790e949d84999b715d7 (patch)
tree5b2a8e9e83bcd59977e9f7ccebaee1e5e56a28bd
parent643441bcaefbb516d9a102158f2964d07e67dd5a (diff)
downloadorg.eclipse.rap.incubator.e4-d9049e285f2a3e0fe24ac790e949d84999b715d7.zip
org.eclipse.rap.incubator.e4-d9049e285f2a3e0fe24ac790e949d84999b715d7.tar.gz
org.eclipse.rap.incubator.e4-d9049e285f2a3e0fe24ac790e949d84999b715d7.tar.bz2
Bug 434480 - [e4] TrimStack creation fails because of missing
CSSRenderingUtils
-rw-r--r--bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/internal/workbench/swt/PartRenderingEngine.java10
-rw-r--r--demo/org.eclipse.rap.e4.demo/Application.e4xmi5
2 files changed, 13 insertions, 2 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 fa5a3ba..5ff41a6 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
@@ -1014,8 +1014,7 @@ public class PartRenderingEngine implements IPresentationEngine {
@Override
public void run() {
- // TODO RAP unsupported
- // initializeStyling(display, runContext);
+ initializeStyling(display, runContext);
// Register an SWT resource handler
runContext.set(IResourceUtilities.class.getName(),
@@ -1227,6 +1226,13 @@ public class PartRenderingEngine implements IPresentationEngine {
}
}
+ public static void initializeStyling(Display display,
+ IEclipseContext appContext) {
+ CSSRenderingUtils cssUtils = ContextInjectionFactory.make(
+ CSSRenderingUtils.class, appContext);
+ appContext.set(CSSRenderingUtils.class, cssUtils);
+ }
+
// FIXME RAP unsupported
// public static void initializeStyling(Display display,
// IEclipseContext appContext) {
diff --git a/demo/org.eclipse.rap.e4.demo/Application.e4xmi b/demo/org.eclipse.rap.e4.demo/Application.e4xmi
index 5607697..c3418e6 100644
--- a/demo/org.eclipse.rap.e4.demo/Application.e4xmi
+++ b/demo/org.eclipse.rap.e4.demo/Application.e4xmi
@@ -14,6 +14,11 @@
<children xsi:type="menu:DirectMenuItem" xmi:id="_y5diwKhGEeO0Haj3z6o3PQ" elementId="org.eclipse.rap.e4.demo.directmenuitem.0" label="%directmenuitem.label.1" contributionURI="bundleclass://org.eclipse.rap.e4.demo/org.eclipse.rap.e4.demo.handlers.ExitApplication"/>
</children>
</mainMenu>
+ <trimBars xmi:id="_svgAANdbEeOAKaBhrzDgEg" elementId="org.eclipse.rap.e4.demo.trimbar.0">
+ <children xsi:type="menu:ToolBar" xmi:id="_uOnCUNdbEeOAKaBhrzDgEg" elementId="org.eclipse.rap.e4.demo.toolbar.0">
+ <children xsi:type="menu:DirectToolItem" xmi:id="_wqJQoNdbEeOAKaBhrzDgEg" elementId="org.eclipse.rap.e4.demo.directtoolitem.0" label="%directmenuitem.label.1" contributionURI="bundleclass://org.eclipse.rap.e4.demo/org.eclipse.rap.e4.demo.handlers.ExitApplication"/>
+ </children>
+ </trimBars>
</children>
<rootContext xmi:id="_-j-tkKBNEeODEs7-bWqIxA" elementId="org.eclipse.ui.contexts.dialogAndWindow" name="In Dialog and Windows">
<children xmi:id="_-j-tkaBNEeODEs7-bWqIxA" elementId="org.eclipse.ui.contexts.window" name="In Windows"/>