Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'bundles')
-rw-r--r--bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/theme/ThemeUtil.java12
-rw-r--r--bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/controlkit/ControlThemeAdapterImpl.java10
2 files changed, 15 insertions, 7 deletions
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/theme/ThemeUtil.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/theme/ThemeUtil.java
index b5c0465b51..1cc9933cc1 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/theme/ThemeUtil.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/rap/rwt/internal/theme/ThemeUtil.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2015 Innoopract Informationssysteme GmbH and others.
+ * Copyright (c) 2007, 2016 Innoopract Informationssysteme GmbH and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -123,16 +123,16 @@ public final class ThemeUtil {
// Methods for accessing themed values
public static CssValue getCssValue( String cssElement,
- String cssProperty,
- SimpleSelector selector )
+ String cssProperty,
+ SimpleSelector selector )
{
return getCssValue( cssElement, cssProperty, selector, null );
}
public static CssValue getCssValue( String cssElement,
- String cssProperty,
- ValueSelector selector,
- Widget widget )
+ String cssProperty,
+ ValueSelector selector,
+ Widget widget )
{
return getCssValue( getCurrentThemeId(), cssElement, cssProperty, selector, widget );
}
diff --git a/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/controlkit/ControlThemeAdapterImpl.java b/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/controlkit/ControlThemeAdapterImpl.java
index 0bdbf4a955..49b0f606b3 100644
--- a/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/controlkit/ControlThemeAdapterImpl.java
+++ b/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/controlkit/ControlThemeAdapterImpl.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2015 Innoopract Informationssysteme GmbH and others.
+ * Copyright (c) 2007, 2016 Innoopract Informationssysteme GmbH and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,12 +13,14 @@ package org.eclipse.swt.internal.widgets.controlkit;
import org.eclipse.rap.rwt.internal.theme.ThemeAdapter;
import org.eclipse.rap.rwt.internal.theme.WidgetMatcher;
+import org.eclipse.rap.rwt.internal.theme.WidgetMatcher.Constraint;
import org.eclipse.rap.rwt.theme.BoxDimensions;
import org.eclipse.rap.rwt.theme.ControlThemeAdapter;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Widget;
public class ControlThemeAdapterImpl extends ThemeAdapter implements ControlThemeAdapter {
@@ -26,6 +28,12 @@ public class ControlThemeAdapterImpl extends ThemeAdapter implements ControlThem
@Override
protected void configureMatcher( WidgetMatcher matcher ) {
matcher.addStyle( "BORDER", SWT.BORDER );
+ matcher.addState( "disabled", new Constraint() {
+ @Override
+ public boolean matches( Widget widget ) {
+ return !( ( Control )widget ).getEnabled();
+ }
+ });
}
@Override

Back to the top