.getCalculatedColumnsWidth(Range.between(
columnConfiguration.getFrozenColumnCount(),
columnConfiguration.getColumnCount()));
+ unfrozenPixels -= subpixelBrowserBugDetector.getActiveAdjustment();
double frozenPixels = scrollContentWidth - unfrozenPixels;
double hScrollOffsetWidth = tableWrapperWidth - frozenPixels;
horizontalScrollbar.setOffsetSize(hScrollOffsetWidth);
* @return the width of a row, in pixels
*/
public double calculateRowWidth() {
- return getCalculatedColumnsWidth(Range.between(0, getColumnCount()));
+ return getCalculatedColumnsWidth(Range.between(0, getColumnCount()))
+ - subpixelBrowserBugDetector.getActiveAdjustment();
}
private void assertArgumentsAreValidAndWithinRange(final int index,
private class SubpixelBrowserBugDetector {
private static final double SUBPIXEL_ADJUSTMENT = .1;
- private boolean hasAlreadyBeenFixed = false;
+ private boolean fixActive = false;
/**
* This is a fix essentially for Firefox and how it handles subpixels.
* {@value #SUBPIXEL_ADJUSTMENT}px narrower.
*/
public void checkAndFix() {
- if (!hasAlreadyBeenFixed && hasSubpixelBrowserBug()) {
+ if (!fixActive && hasSubpixelBrowserBug()) {
fixSubpixelBrowserBug();
- hasAlreadyBeenFixed = true;
+ fixActive = true;
+ }
+ }
+
+ private double getActiveAdjustment() {
+ if (fixActive) {
+ return -SUBPIXEL_ADJUSTMENT;
+ } else {
+ return 0.0;
}
}
public void invalidateFix() {
adjustBookkeepingPixels(SUBPIXEL_ADJUSTMENT);
- hasAlreadyBeenFixed = false;
+ fixActive = false;
}
private boolean hasSubpixelBrowserBug() {
--- /dev/null
+/*
+ * 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 java.util.Random;
+
+import com.vaadin.annotations.Theme;
+import com.vaadin.data.util.BeanItemContainer;
+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.Button.ClickListener;
+import com.vaadin.ui.Grid;
+import com.vaadin.ui.Grid.SelectionMode;
+
+@Theme("valo")
+public class GridSubPixelProblemWrapping extends AbstractTestUI {
+
+ Random r = new Random();
+
+ public static class DataObject {
+ String foo;
+ String Bar;
+
+ public DataObject(Random r) {
+ foo = r.nextInt() + "";
+ Bar = r.nextInt() + "";
+ }
+
+ public DataObject(String foo, String bar) {
+ this.foo = foo;
+ Bar = bar;
+ }
+
+ public String getFoo() {
+ return foo;
+ }
+
+ public void setFoo(String foo) {
+ this.foo = foo;
+ }
+
+ public String getBar() {
+ return Bar;
+ }
+
+ public void setBar(String bar) {
+ Bar = bar;
+ }
+
+ }
+
+ Button button = new Button("Click", new ClickListener() {
+ @Override
+ public void buttonClick(ClickEvent event) {
+ addDAO();
+ }
+ });
+
+ private BeanItemContainer<DataObject> container;
+ private int counter = 0;
+
+ @Override
+ protected void setup(VaadinRequest request) {
+ addComponent(button);
+ container = new BeanItemContainer<DataObject>(DataObject.class);
+ container.addBean(new DataObject("Foo", "Bar"));
+ Grid grid = new Grid(container);
+ grid.getColumn("foo").setWidth(248.525);
+ grid.setSelectionMode(SelectionMode.SINGLE);
+ grid.setEditorEnabled(true);
+ grid.setWidth("500px");
+
+ addComponent(grid);
+ }
+
+ private void addDAO() {
+ counter++;
+ container.addBean(new DataObject("Foo" + counter, "Bar" + counter));
+
+ }
+}
--- /dev/null
+/*
+ * 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 java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.remote.DesiredCapabilities;
+
+import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.testbench.elements.GridElement;
+import com.vaadin.testbench.elements.GridElement.GridRowElement;
+import com.vaadin.testbench.parallel.Browser;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class GridSubPixelProblemWrappingTest extends MultiBrowserTest {
+
+ @Override
+ public List<DesiredCapabilities> getBrowsersToTest() {
+ List<DesiredCapabilities> l = super.getBrowsersToTest();
+ // Currently broken because of #18214
+ l.remove(Browser.IE9.getDesiredCapabilities());
+ return l;
+ }
+
+ @Test
+ public void addedRowShouldNotWrap() {
+ openTestURL();
+
+ GridElement grid = $(GridElement.class).first();
+
+ // Cells in first row should be at the same y coordinate as the row
+ assertRowAndCellTops(grid, 0);
+
+ // Add a row
+ $(ButtonElement.class).first().click();
+
+ // Cells in the first row should be at the same y coordinate as the row
+ assertRowAndCellTops(grid, 0);
+ // Cells in the second row should be at the same y coordinate as the row
+ assertRowAndCellTops(grid, 1);
+ }
+
+ private void assertRowAndCellTops(GridElement grid, int rowIndex) {
+ GridRowElement row = grid.getRow(rowIndex);
+ int rowTop = row.getLocation().y;
+
+ int cell0Top = grid.getCell(rowIndex, 0).getLocation().y;
+ int cell1Top = grid.getCell(rowIndex, 1).getLocation().y;
+ Assert.assertEquals(rowTop, cell0Top);
+ Assert.assertEquals(rowTop, cell1Top);
+ }
+}
projects / vaadin-framework.git / commitdiff