diff options
| -rw-r--r-- | WebContent/VAADIN/themes/base/grid/grid.scss | 8 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnResizeTest.java | 15 |
2 files changed, 16 insertions, 7 deletions
diff --git a/WebContent/VAADIN/themes/base/grid/grid.scss b/WebContent/VAADIN/themes/base/grid/grid.scss index 764bd24707..d269b2f5e6 100644 --- a/WebContent/VAADIN/themes/base/grid/grid.scss +++ b/WebContent/VAADIN/themes/base/grid/grid.scss @@ -267,6 +267,7 @@ $v-grid-details-border-bottom-stripe: 1px solid darken($v-grid-row-background-co .#{$primaryStyleName}-column-resize-handle { position: absolute; width: 2 * $v-grid-cell-padding-horizontal; + right: -$v-grid-cell-padding-horizontal; top: 0px; bottom: 0px; cursor: col-resize; @@ -279,13 +280,6 @@ $v-grid-details-border-bottom-stripe: 1px solid darken($v-grid-row-background-co -ms-user-select: none; user-select: none; } - - .sort-asc, - .sort-desc { - > .#{$primaryStyleName}-column-resize-handle { - right: -$v-grid-cell-padding-horizontal; - } - } // Footer diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnResizeTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnResizeTest.java index 5253e0fff9..7fdf7acbab 100644 --- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnResizeTest.java +++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridColumnResizeTest.java @@ -101,6 +101,21 @@ public class GridColumnResizeTest extends GridBasicFeaturesTest { } } + @Test + public void testResizeWithWidgetHeader() { + selectMenuPath("Component", "Columns", "Column 0", "Column 0 Width", + "250px"); + selectMenuPath("Component", "Columns", "Column 0", "Header Type", + "Widget Header"); + + // IE9 and IE10 sometimes have a 1px gap between resize handle parts, so + // using posX 1px + dragResizeColumn(0, 1, 10); + + assertTrue("Log should contain a resize event", + logContainsText("ColumnResizeEvent: isUserOriginated? true")); + } + private void dragResizeColumn(int columnIndex, int posX, int offset) { GridCellElement headerCell = getGridElement().getHeaderCell(0, columnIndex); |