From eb64fda3eb8e04e9dd5ac014981d6e7cc9683b44 Mon Sep 17 00:00:00 2001
From: Leif Åstrand <leif@vaadin.com>
Date: Wed, 12 Jun 2013 15:14:09 +0300
Subject: Add support for rem units (#11279)

Change-Id: Id6b6402b22956cd96b86cef86f11088e959dc05d
---
 server/src/com/vaadin/server/Sizeable.java         |  4 ++
 server/src/com/vaadin/ui/AbstractComponent.java    |  2 +-
 .../server/component/ComponentSizeParseTest.java   | 61 ++++++++++++++++++++++
 3 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 server/tests/src/com/vaadin/tests/server/component/ComponentSizeParseTest.java

(limited to 'server')

diff --git a/server/src/com/vaadin/server/Sizeable.java b/server/src/com/vaadin/server/Sizeable.java
index 38e998c04b..decace3d10 100644
--- a/server/src/com/vaadin/server/Sizeable.java
+++ b/server/src/com/vaadin/server/Sizeable.java
@@ -100,6 +100,10 @@ public interface Sizeable extends Serializable {
          * Unit code representing the font-size of the relevant font.
          */
         EM("em"),
+        /**
+         * Unit code representing the font-size of the root font.
+         */
+        REM("rem"),
         /**
          * Unit code representing the x-height of the relevant font.
          */
diff --git a/server/src/com/vaadin/ui/AbstractComponent.java b/server/src/com/vaadin/ui/AbstractComponent.java
index 0bf27435fb..772a26bda2 100644
--- a/server/src/com/vaadin/ui/AbstractComponent.java
+++ b/server/src/com/vaadin/ui/AbstractComponent.java
@@ -81,7 +81,7 @@ public abstract class AbstractComponent extends AbstractClientConnector
     private Unit widthUnit = Unit.PIXELS;
     private Unit heightUnit = Unit.PIXELS;
     private static final Pattern sizePattern = Pattern
-            .compile("^(-?\\d+(\\.\\d+)?)(%|px|em|ex|in|cm|mm|pt|pc)?$");
+            .compile("^(-?\\d+(\\.\\d+)?)(%|px|em|rem|ex|in|cm|mm|pt|pc)?$");
 
     private ErrorHandler errorHandler = null;
 
diff --git a/server/tests/src/com/vaadin/tests/server/component/ComponentSizeParseTest.java b/server/tests/src/com/vaadin/tests/server/component/ComponentSizeParseTest.java
new file mode 100644
index 0000000000..11c0d10998
--- /dev/null
+++ b/server/tests/src/com/vaadin/tests/server/component/ComponentSizeParseTest.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2000-2013 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.vaadin.tests.server.component;
+
+import junit.framework.TestCase;
+
+import org.junit.Assert;
+
+import com.vaadin.server.Sizeable.Unit;
+import com.vaadin.shared.ui.label.LabelState;
+import com.vaadin.ui.Label;
+
+public class ComponentSizeParseTest extends TestCase {
+
+    private final class LabelWithPublicState extends Label {
+        @Override
+        protected LabelState getState() {
+            return super.getState();
+        }
+    }
+
+    public void testAllTheUnit() {
+        testUnit("10.0px", 10, Unit.PIXELS);
+        testUnit("10.0pt", 10, Unit.POINTS);
+        testUnit("10.0pc", 10, Unit.PICAS);
+        testUnit("10.0em", 10, Unit.EM);
+        testUnit("10.0rem", 10, Unit.REM);
+        testUnit("10.0mm", 10, Unit.MM);
+        testUnit("10.0cm", 10, Unit.CM);
+        testUnit("10.0in", 10, Unit.INCH);
+        testUnit("10.0%", 10, Unit.PERCENTAGE);
+    }
+
+    private void testUnit(String string, int amout, Unit unit) {
+        LabelWithPublicState label = new LabelWithPublicState();
+        label.setHeight(string);
+
+        Assert.assertEquals(amout, label.getHeight(), 0);
+        Assert.assertEquals(unit, label.getHeightUnits());
+
+        label = new LabelWithPublicState();
+
+        label.setHeight(10, unit);
+        label.beforeClientResponse(true);
+        Assert.assertEquals(string, label.getState().height);
+    }
+}
-- 
cgit v1.2.3