From: Juho Nurminen <juho@vaadin.com>
Date: Tue, 29 Oct 2013 15:26:22 +0000 (+0200)
Subject: Changed v-customcomponent overflow to visible (#12482)
X-Git-Tag: 7.2.0.beta1~246
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a3e176c5607e43cf72c557c52287d6b68e4b5a5c;p=vaadin-framework.git

Changed v-customcomponent overflow to visible (#12482)

Change-Id: I1e82337e719d16abce2c7f2060162af81f9192ea
---

diff --git a/WebContent/VAADIN/themes/base/customcomponent/customcomponent.scss b/WebContent/VAADIN/themes/base/customcomponent/customcomponent.scss
index 461e1b1246..d672254a86 100644
--- a/WebContent/VAADIN/themes/base/customcomponent/customcomponent.scss
+++ b/WebContent/VAADIN/themes/base/customcomponent/customcomponent.scss
@@ -1,7 +1,6 @@
 @mixin base-customcomponent($primaryStyleName : v-customcomponent) {
 
 .#{$primaryStyleName} {
-	overflow: hidden;
 }
 
 }
\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/components/customfield/CustomFieldSize.java b/uitest/src/com/vaadin/tests/components/customfield/CustomFieldSize.java
new file mode 100644
index 0000000000..a3e19513b0
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/customfield/CustomFieldSize.java
@@ -0,0 +1,65 @@
+/*
+ * 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.customfield;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.CustomField;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.VerticalLayout;
+
+/**
+ * 
+ * @since
+ * @author Vaadin Ltd
+ */
+public class CustomFieldSize extends AbstractTestUI {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        VerticalLayout layout = new VerticalLayout();
+        setContent(layout);
+        layout.setWidth("50px");
+
+        layout.addComponent(new TextField());
+
+        layout.addComponent(new CustomField<String>() {
+
+            @Override
+            protected Component initContent() {
+                return new TextField();
+            }
+
+            @Override
+            public Class<? extends String> getType() {
+                return String.class;
+            }
+
+        });
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "Any part of a TextField wrapped in a CustomField should not be cut off even when the dimensions of the TextField exceed those of the CustomField";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 12482;
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/components/customfield/CustomFieldSizeTest.java b/uitest/src/com/vaadin/tests/components/customfield/CustomFieldSizeTest.java
new file mode 100644
index 0000000000..c47ec0b792
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/customfield/CustomFieldSizeTest.java
@@ -0,0 +1,36 @@
+/*
+ * 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.customfield;
+
+import java.io.IOException;
+
+import org.junit.Test;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+/**
+ * 
+ * @since
+ * @author Vaadin Ltd
+ */
+public class CustomFieldSizeTest extends MultiBrowserTest {
+
+    @Test
+    public void checkScreenshot() throws IOException {
+        openTestURL();
+        compareScreen("size");
+    }
+}