]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d423120)
Test case and fix for #3458 - Extra scrollbars inside SplitPanel when content changes
authorArtur Signell <artur.signell@itmill.com>
Fri, 2 Oct 2009 15:30:22 +0000 (15:30 +0000)
committerArtur Signell <artur.signell@itmill.com>
Fri, 2 Oct 2009 15:30:22 +0000 (15:30 +0000)
svn changeset:9057/svn branch:6.1

src/com/vaadin/terminal/gwt/client/ui/VSplitPanel.java patch | blob | history
src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.html [new file with mode: 0644] patch | blob
src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java [new file with mode: 0644] patch | blob

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VSplitPanel.java b/src/com/vaadin/terminal/gwt/client/ui/VSplitPanel.java
index 688283e61d6e7a70e44783e4b252791e7840013b..28dba93a0443648fb6ae05c601f43bfdf947719b 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VSplitPanel.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VSplitPanel.java
@@ -198,6 +198,11 @@ public class VSplitPanel extends ComplexPanel implements Container,
                 }
             });
         }
+
+        // This is needed at least for cases like #3458 to take
+        // appearing/disappearing scrollbars into account.
+        client.runDescendentsLayout(this);
+        
         rendering = false;
 
     }
diff --git a/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.html b/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.html
new file mode 100644 (file)
index 0000000..e8e7395
--- /dev/null
+++ b/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.html
@@ -0,0 +1,42 @@
+<?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>SplitPanelExtraScrollbars</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">SplitPanelExtraScrollbars</td></tr>
+</thead><tbody>
+<tr>
+       <td>open</td>
+       <td>/run/com.vaadin.tests.components.splitpanel.SplitPanelExtraScrollbars</td>
+       <td></td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>click</td>
+       <td>vaadin=runcomvaadintestscomponentssplitpanelSplitPanelExtraScrollbars::/VSplitPanelHorizontal[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VNativeButton[0]</td>
+       <td></td>
+</tr>
+<tr>
+       <td>waitForVaadin</td>
+       <td></td>
+       <td></td>
+</tr>
+<tr>
+       <td>screenCapture</td>
+       <td></td>
+       <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java b/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java
new file mode 100644 (file)
index 0000000..9d9800e
--- /dev/null
+++ b/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java
@@ -0,0 +1,67 @@
+package com.vaadin.tests.components.splitpanel;\r
+import com.vaadin.terminal.Sizeable;\r
+import com.vaadin.tests.components.AbstractTestCase;\r
+import com.vaadin.ui.Button;\r
+import com.vaadin.ui.HorizontalLayout;\r
+import com.vaadin.ui.NativeButton;\r
+import com.vaadin.ui.SplitPanel;\r
+import com.vaadin.ui.Window;\r
+import com.vaadin.ui.Button.ClickEvent;\r
+import com.vaadin.ui.Button.ClickListener;\r
+\r
+public class SplitPanelExtraScrollbars extends AbstractTestCase implements\r
+        ClickListener {\r
+\r
+    private SplitPanel sp;\r
+    private HorizontalLayout hl;\r
+    private Button b;\r
+\r
+    @Override\r
+    public void init() {\r
+        sp = new SplitPanel(SplitPanel.ORIENTATION_HORIZONTAL);\r
+        sp.setSizeFull();\r
+        sp.setSplitPosition(0, Sizeable.UNITS_PIXELS);\r
+\r
+        hl = new HorizontalLayout();\r
+        hl.setMargin(true);\r
+        hl.setWidth("100%");\r
+        hl.setHeight(null);\r
+\r
+        b = createButton("200px");\r
+        sp.setSecondComponent(hl);\r
+        hl.addComponent(b);\r
+\r
+        Window w = new Window("Test", sp);\r
+        setMainWindow(w);\r
+    }\r
+\r
+    private Button createButton(String height) {\r
+        Button b = new NativeButton("A BIG button");\r
+        b.setHeight(height);\r
+        b.addListener(this);\r
+        return b;\r
+    }\r
+\r
+    @Override\r
+    protected String getDescription() {\r
+        return "Click the button to change its height. Making the button higher than the browser should not cause vertical but not horizontal scrollbars to appear.";\r
+    }\r
+\r
+    @Override\r
+    protected Integer getTicketNumber() {\r
+        return 3458;\r
+    }\r
+\r
+    public void buttonClick(ClickEvent event) {\r
+        if (b.getHeight() == 200) {\r
+            b.setHeight("1200px");\r
+        } else {\r
+            b.setHeight("200px");\r
+        }\r
+\r
+        // Sending all changes in one repaint triggers the bug\r
+        hl.requestRepaint();\r
+        sp.requestRepaint();\r
+    }\r
+\r
+}\r
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework