diff options
author | John Ahlroos <john@vaadin.com> | 2012-12-14 14:14:04 +0000 |
---|---|---|
committer | Vaadin Code Review <review@vaadin.com> | 2012-12-14 14:14:04 +0000 |
commit | 2a1c1222ec51a4a8979589ffef56f32c2924f617 (patch) | |
tree | 860fa22c06976f9e575c4a4ced362651c4f41924 /server | |
parent | 5b1bb852142f366df7c70ca6e02edc3ba23bba7c (diff) | |
parent | 72943f25d0aa5e936cefabe58f1858ff12c94894 (diff) | |
download | vaadin-framework-2a1c1222ec51a4a8979589ffef56f32c2924f617.tar.gz vaadin-framework-2a1c1222ec51a4a8979589ffef56f32c2924f617.zip |
Merge "Colorpicker IE fixes"
Diffstat (limited to 'server')
-rw-r--r-- | server/src/com/vaadin/ui/components/colorpicker/ColorPickerGradient.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/server/src/com/vaadin/ui/components/colorpicker/ColorPickerGradient.java b/server/src/com/vaadin/ui/components/colorpicker/ColorPickerGradient.java index ddd61f37b2..1bff71f0f7 100644 --- a/server/src/com/vaadin/ui/components/colorpicker/ColorPickerGradient.java +++ b/server/src/com/vaadin/ui/components/colorpicker/ColorPickerGradient.java @@ -52,9 +52,6 @@ public class ColorPickerGradient extends AbstractComponent implements /** The y-coordinate. */ private int y = 0; - /** The background color. */ - private Color backgroundColor; - /** * Instantiates a new color picker gradient. * @@ -65,7 +62,7 @@ public class ColorPickerGradient extends AbstractComponent implements */ public ColorPickerGradient(String id, Coordinates2Color converter) { registerRpc(rpc); - getState().id = id; + addStyleName(id); // width and height must be set here instead of in theme, otherwise // coordinate calculations fail getState().width = "220px"; @@ -103,7 +100,6 @@ public class ColorPickerGradient extends AbstractComponent implements * the new background color */ public void setBackgroundColor(Color color) { - backgroundColor = color; getState().bgColor = color.getCSS(); } |