if (!visibilityChangesDisabled) {
super.setVisible(visible);
}
+
+ if (visible && BrowserInfo.get().isWebkit()) {
+
+ /*
+ * Shake up the DOM a bit to make the window shed unnecessary
+ * scrollbars and resize correctly afterwards. This resulting code
+ * took over a week to summon forth, and involved some pretty hairy
+ * black magic. Don't touch it unless you know what you're doing!
+ * Fixes ticket #11994
+ */
+ Scheduler.get().scheduleFinally(new ScheduledCommand() {
+ @Override
+ public void execute() {
+ final com.google.gwt.dom.client.Element scrollable = contents
+ .getFirstChildElement();
+ final String oldWidth = scrollable.getStyle().getWidth();
+ final String oldHeight = scrollable.getStyle().getHeight();
+
+ scrollable.getStyle().setWidth(110, Unit.PCT);
+ scrollable.getOffsetWidth();
+ scrollable.getStyle().setProperty("width", oldWidth);
+
+ scrollable.getStyle().setHeight(110, Unit.PCT);
+ scrollable.getOffsetHeight();
+ scrollable.getStyle().setProperty("height", oldHeight);
+
+ updateContentsSize();
+ positionOrSizeUpdated();
+ }
+ });
+ }
}
/** For internal use only. May be removed or replaced in the future. */
--- /dev/null
+<?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.browserfeatures.WebkitScrollbarTest?restartApplication</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>vaadin=runcomvaadintestsbrowserfeaturesWebkitScrollbarTest::/VVerticalLayout[0]/Slot[0]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td>windowShouldNotHaveScrollbars</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
--- /dev/null
+/*
+ * 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.browserfeatures;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.ListSelect;
+import com.vaadin.ui.UI;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+
+@SuppressWarnings("serial")
+public class WebkitScrollbarTest extends AbstractTestUI {
+
+ @Override
+ protected void setup(VaadinRequest request) {
+ final VerticalLayout uiLayout = new VerticalLayout();
+ uiLayout.setMargin(true);
+ setContent(uiLayout);
+
+ final VerticalLayout windowLayout = new VerticalLayout();
+
+ final Window testWindow = new Window("WebKitFail", windowLayout);
+ testWindow.setWidth(300, Unit.PIXELS);
+
+ GridLayout gl = new GridLayout();
+ gl.setHeight(null);
+ gl.setWidth(100, Unit.PERCENTAGE);
+ windowLayout.addComponent(gl);
+
+ ListSelect listSelect = new ListSelect();
+ listSelect.setWidth(100, Unit.PERCENTAGE);
+ gl.addComponent(listSelect);
+ gl.setMargin(true);
+
+ final Button testButton = new Button("Open Window",
+ new Button.ClickListener() {
+ @Override
+ public void buttonClick(ClickEvent event) {
+ UI.getCurrent().addWindow(testWindow);
+ }
+ });
+ uiLayout.addComponent(testButton);
+
+ }
+
+ @Override
+ protected String getTestDescription() {
+ return "When opening the window, it should NOT contain a horizontal"
+ + " scrollbar and the vertical height should be proportional"
+ + " to the list select component inside it.";
+ }
+
+ @Override
+ protected Integer getTicketNumber() {
+ return 11994;
+ }
+
+}
projects / vaadin-framework.git / commitdiff