Add support for rem units (#11279)

Change-Id: Id6b6402b22956cd96b86cef86f11088e959dc05d

diff --git a/server/src/com/vaadin/server/Sizeable.java b/server/src/com/vaadin/server/Sizeable.java
index 38e998c04bd843ccbc3c9b5793c54b2fc77c5453..decace3d1053d42d3b2f9d868ddf140ba4f849cd 100644 (file)
--- 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 0bf27435fb5ca178cbf8eef3369e1a9c6b438638..772a26bda290d9ad116ad2df23b47c42536d2bd9 100644 (file)
--- 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 (file)
index 0000000..11c0d10
--- /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);
+    }
+}

diff --git a/uitest/src/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.html b/uitest/src/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.html
new file mode 100644 (file)
index 0000000..0bdde03
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.html
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="" />
+<title>New Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">New Test</td></tr>
+</thead><tbody>
+<tr>
+       <td>open</td>
+       <td>/run/com.vaadin.tests.components.abstractcomponent.RemSizeUnitTest?restartApplication&amp;debug</td>
+       <td></td>
+</tr>
+<tr>
+       <td>assertElementHeight</td>
+       <td>vaadin=runcomvaadintestscomponentsabstractcomponentRemSizeUnitTest::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VLabel[0]</td>
+       <td>80</td>
+</tr>
+<tr>
+       <td>assertElementWidth</td>
+       <td>vaadin=runcomvaadintestscomponentsabstractcomponentRemSizeUnitTest::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VLabel[0]</td>
+       <td>168</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>

diff --git a/uitest/src/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.java b/uitest/src/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.java
new file mode 100644 (file)
index 0000000..98c0538
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/abstractcomponent/RemSizeUnitTest.java
@@ -0,0 +1,52 @@
+/*
+ * 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.components.abstractcomponent;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.server.WebBrowser;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Label;
+
+public class RemSizeUnitTest extends AbstractTestUI {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        Label label = new Label("My height is 10.5 x 5  rem");
+        label.setHeight("5rem");
+        label.setWidth(10.5f, Unit.REM);
+
+        // Rem not supported in ie8, fake using pixels
+        WebBrowser webBrowser = getPage().getWebBrowser();
+        if (webBrowser.isIE() && webBrowser.getBrowserMajorVersion() == 8) {
+            label.setHeight("80px");
+            label.setWidth("168px");
+        }
+
+        addComponent(label);
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "Tests that REM units are properly applied to the DOM";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return Integer.valueOf(11279);
+    }
+
+}