| commit | a1c87a7460a168c0f5d6701b68c71861e44bf4a5 | [log] [tgz] |
|---|---|---|
| author | Paul Webster <pwebster> | Fri May 21 15:22:02 2010 +0000 |
| committer | Paul Webster <pwebster> | Fri May 21 15:22:02 2010 +0000 |
| tree | 60e36475605fcb540255953910fa317d430783f5 | |
| parent | 38b1f4067dcb84704abbbc29e7c525326661f938 [diff] |
Bug 312842 - Add some margin space between the trim and the "client area." * fixed NPE when no margin set in CSS
diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/workbench/ui/renderers/swt/CSSEngineHelper.java b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/workbench/ui/renderers/swt/CSSEngineHelper.java index 9f8a078..b9ffeaf 100644 --- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/workbench/ui/renderers/swt/CSSEngineHelper.java +++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/workbench/ui/renderers/swt/CSSEngineHelper.java
@@ -108,7 +108,8 @@ } private int getPxValue(CSSValue value, int defaultValue) { - if ((value.getCssValueType() == CSSValue.CSS_PRIMITIVE_VALUE) + if (value != null + && (value.getCssValueType() == CSSValue.CSS_PRIMITIVE_VALUE) && (((CSSPrimitiveValue) value).getPrimitiveType() == CSSPrimitiveValue.CSS_PX)) { return (int) ((CSSPrimitiveValue) value) .getFloatValue(CSSPrimitiveValue.CSS_PX);