aboutsummaryrefslogtreecommitdiffstats
path: root/eclipse
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@google.com>2012-02-27 11:28:28 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-02-27 11:28:28 -0800
commitceca5078d7c9d842bd4f0004b76e5a6e8be3bbec (patch)
treed1cbef2d4afe6823a70de1cf2c4489b3676ba5e1 /eclipse
parent502b371a60e8747996abde1b5cd64ec7eb10a47f (diff)
parenta887e2d2023da16d3f38ea6d8066b08e8e0dd4de (diff)
downloadsdk-ceca5078d7c9d842bd4f0004b76e5a6e8be3bbec.zip
sdk-ceca5078d7c9d842bd4f0004b76e5a6e8be3bbec.tar.gz
sdk-ceca5078d7c9d842bd4f0004b76e5a6e8be3bbec.tar.bz2
Merge "17467: Display update problem for Custom & Library View"
Diffstat (limited to 'eclipse')
-rwxr-xr-xeclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/PaletteControl.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/PaletteControl.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/PaletteControl.java
index 9ffe095..d35037a 100755
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/PaletteControl.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/PaletteControl.java
@@ -485,8 +485,10 @@ public class PaletteControl extends Composite {
if (mPaletteMode.isPreview() && mBackground != null) {
wrapper.setBackground(mBackground);
}
- composite = super.createChildContainer(wrapper, header,
- style | SWT.NO_BACKGROUND);
+ composite = super.createChildContainer(wrapper, header, style);
+ if (mBackground != null) {
+ composite.setBackground(mBackground);
+ }
composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
Button refreshButton = new Button(wrapper, SWT.PUSH | SWT.FLAT);