From bd39b3ad6bed5c009c64d5fc6a83c3b0f8c161e7 Mon Sep 17 00:00:00 2001 From: Teemu Suo-Anttila Date: Thu, 7 Jan 2016 15:45:26 +0200 Subject: Fix ScrollbarBundle to not round down pixel values (#19421) Since Escalator now uses subpixels in most cases, scrollbar calculation fails when ScrollbarBundle calls Math.floor for the offset size. Removed rounding, added a pixel epsilon check that we don't make a scrollbar when it's not really needed. Change-Id: I779e678a7f7a22b367e8329aa17e5980fde42fba --- .../grid/GridMultiSelectionScrollBar.java | 34 +++++++++++++++++ .../grid/GridMultiSelectionScrollBarTest.java | 44 ++++++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 uitest/src/com/vaadin/tests/components/grid/GridMultiSelectionScrollBar.java create mode 100644 uitest/src/com/vaadin/tests/components/grid/GridMultiSelectionScrollBarTest.java (limited to 'uitest') diff --git a/uitest/src/com/vaadin/tests/components/grid/GridMultiSelectionScrollBar.java b/uitest/src/com/vaadin/tests/components/grid/GridMultiSelectionScrollBar.java new file mode 100644 index 0000000000..be1f32164c --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/grid/GridMultiSelectionScrollBar.java @@ -0,0 +1,34 @@ +/* + * Copyright 2000-2014 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.grid; + +import com.vaadin.server.VaadinRequest; +import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.ui.Grid; + +public class GridMultiSelectionScrollBar extends AbstractTestUI { + + @Override + protected void setup(VaadinRequest request) { + Grid grid = new Grid(); + grid.addColumn("X").setWidth(39.25d); + grid.addColumn("Hello"); + grid.addColumn("World"); + grid.setFrozenColumnCount(1); + addComponent(grid); + } + +} diff --git a/uitest/src/com/vaadin/tests/components/grid/GridMultiSelectionScrollBarTest.java b/uitest/src/com/vaadin/tests/components/grid/GridMultiSelectionScrollBarTest.java new file mode 100644 index 0000000000..cf85f4eecd --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/grid/GridMultiSelectionScrollBarTest.java @@ -0,0 +1,44 @@ +/* + * Copyright 2000-2014 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.grid; + +import static org.junit.Assert.assertTrue; + +import java.io.IOException; + +import org.junit.Test; + +import com.vaadin.testbench.elements.GridElement; +import com.vaadin.tests.tb3.MultiBrowserTest; + +public class GridMultiSelectionScrollBarTest extends MultiBrowserTest { + + @Test + public void testNoVisibleScrollBar() throws IOException { + setDebug(true); + openTestURL(); + + assertTrue( + "Horizontal scrollbar should not be visible.", + $(GridElement.class).first().getHorizontalScroller() + .getAttribute("style").toLowerCase() + .contains("display: none;")); + + // Just to make sure nothing odd happened. + assertNoErrorNotifications(); + } + +} -- cgit v1.2.3