aboutsummaryrefslogtreecommitdiffstats
path: root/server/src/com/vaadin/ui
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-12-14 10:42:36 +0200
committerArtur Signell <artur@vaadin.com>2012-12-14 15:20:44 +0200
commite2086217131c7e2c3c9df87fb25da9603dd99091 (patch)
treeb3ba6e717507c5b1c6c5a89f73ff7a2e38aa1619 /server/src/com/vaadin/ui
parentd997604e1bf846ca3ae5ada6c1b5938e3e603265 (diff)
downloadvaadin-framework-e2086217131c7e2c3c9df87fb25da9603dd99091.tar.gz
vaadin-framework-e2086217131c7e2c3c9df87fb25da9603dd99091.zip
Send fraction pixel values to the client (#10531)
Fixed RichTextArea to deal with fraction pixel values Change-Id: I02fa6fd2c66e87b01f642a9051641a0cc758f0f6
Diffstat (limited to 'server/src/com/vaadin/ui')
-rw-r--r--server/src/com/vaadin/ui/AbstractComponent.java12
1 files changed, 2 insertions, 10 deletions
diff --git a/server/src/com/vaadin/ui/AbstractComponent.java b/server/src/com/vaadin/ui/AbstractComponent.java
index 63cf19283f..49c3d75385 100644
--- a/server/src/com/vaadin/ui/AbstractComponent.java
+++ b/server/src/com/vaadin/ui/AbstractComponent.java
@@ -593,11 +593,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
* @return CSS height
*/
private String getCSSHeight() {
- if (getHeightUnits() == Unit.PIXELS) {
- return ((int) getHeight()) + getHeightUnits().getSymbol();
- } else {
- return getHeight() + getHeightUnits().getSymbol();
- }
+ return getHeight() + getHeightUnits().getSymbol();
}
/**
@@ -606,11 +602,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
* @return CSS width
*/
private String getCSSWidth() {
- if (getWidthUnits() == Unit.PIXELS) {
- return ((int) getWidth()) + getWidthUnits().getSymbol();
- } else {
- return getWidth() + getWidthUnits().getSymbol();
- }
+ return getWidth() + getWidthUnits().getSymbol();
}
/**