summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2016-09-15 22:46:23 +0300
committerArtur Signell <artur@vaadin.com>2016-09-15 22:52:06 +0300
commitb00c580ed70f682a42afbfa91f978921bb86c2cd (patch)
treeb62cbe6d483f202f2365ef9dfd71dc11d937bd0b /client
parent516c428ca127e3c31b7b4d74220e4b7eed4571be (diff)
downloadvaadin-framework-b00c580ed70f682a42afbfa91f978921bb86c2cd.tar.gz
vaadin-framework-b00c580ed70f682a42afbfa91f978921bb86c2cd.zip
Use correct column index when calculating min width during resize (#19833)
Change-Id: If7a7a5c1e5eff4bdac0f6e5943a9fac2ce98784a
Diffstat (limited to 'client')
-rw-r--r--client/src/main/java/com/vaadin/client/widgets/Grid.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/client/src/main/java/com/vaadin/client/widgets/Grid.java b/client/src/main/java/com/vaadin/client/widgets/Grid.java
index 69eec13d28..e55940582b 100644
--- a/client/src/main/java/com/vaadin/client/widgets/Grid.java
+++ b/client/src/main/java/com/vaadin/client/widgets/Grid.java
@@ -3214,7 +3214,6 @@ public class Grid<T> extends ResizeComposite implements
private void calculate() {
isScheduled = false;
rescheduleCount = 0;
-
assert !dataIsBeingFetched : "Trying to calculate column widths even though data is still being fetched.";
if (columnsAreGuaranteedToBeWiderThanGrid()) {
@@ -5713,7 +5712,7 @@ public class Grid<T> extends ResizeComposite implements
initialWidth = col.getWidthActual();
minCellWidth = escalator
- .getMinCellWidth(getColumns()
+ .getMinCellWidth(getVisibleColumns()
.indexOf(col));
for (Column<?, T> c : getVisibleColumns()) {
if (selectionColumn == c) {