From 1a0a3bd5cf248d3b368e52608d38767f2a501115 Mon Sep 17 00:00:00 2001 From: Anna Koskinen Date: Mon, 4 Feb 2013 13:22:59 +0200 Subject: Merge of (#10890) to Vaadin 7. Fix the positioning of the drop marker when reordering Table columns by DnD. Change-Id: I853e9690d931a9bf94c61ac6e59accd1cedac15a --- client/src/com/vaadin/client/ui/VScrollTable.java | 6 ++- .../table/ColumnReorderingWithManyColumns.html | 42 +++++++++++++++++++ .../table/ColumnReorderingWithManyColumns.java | 48 ++++++++++++++++++++++ 3 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 uitest/src/com/vaadin/tests/components/table/ColumnReorderingWithManyColumns.html create mode 100644 uitest/src/com/vaadin/tests/components/table/ColumnReorderingWithManyColumns.java diff --git a/client/src/com/vaadin/client/ui/VScrollTable.java b/client/src/com/vaadin/client/ui/VScrollTable.java index b9244a1e91..8553398718 100644 --- a/client/src/com/vaadin/client/ui/VScrollTable.java +++ b/client/src/com/vaadin/client/ui/VScrollTable.java @@ -2629,7 +2629,11 @@ public class VScrollTable extends FlowPanel implements HasWidgets, for (int i = start; i <= visibleCellCount; i++) { if (i > 0) { final String colKey = getColKeyByIndex(i - 1); - slotX += getColWidth(colKey); + // getColWidth only returns the internal width + // without padding, not the offset width of the + // whole td (#10890) + slotX += getColWidth(colKey) + + scrollBody.getCellExtraWidth(); } final int dist = Math.abs(x - slotX); if (closestDistance == -1 || dist < closestDistance) { diff --git a/uitest/src/com/vaadin/tests/components/table/ColumnReorderingWithManyColumns.html b/uitest/src/com/vaadin/tests/components/table/ColumnReorderingWithManyColumns.html new file mode 100644 index 0000000000..5b5c83e629 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/table/ColumnReorderingWithManyColumns.html @@ -0,0 +1,42 @@ + + + + + + +ColumnReorderingWithManyColumns + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ColumnReorderingWithManyColumns
open/run/ColumnReorderingWithManyColumns?restartApplication
dragvaadin=runColumnReorderingWithManyColumns::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VScrollTable[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/10,10
mouseMoveAtvaadin=runColumnReorderingWithManyColumns::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VScrollTable[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[10]/domChild[2]10,10
screenCapture
dropvaadin=runColumnReorderingWithManyColumns::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VScrollTable[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[10]/domChild[2]10,10
+ + diff --git a/uitest/src/com/vaadin/tests/components/table/ColumnReorderingWithManyColumns.java b/uitest/src/com/vaadin/tests/components/table/ColumnReorderingWithManyColumns.java new file mode 100644 index 0000000000..aeebd299ff --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/table/ColumnReorderingWithManyColumns.java @@ -0,0 +1,48 @@ +/* + * Copyright 2012 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.table; + +import com.vaadin.tests.components.TestBase; +import com.vaadin.ui.Table; + +public class ColumnReorderingWithManyColumns extends TestBase { + + private static final int NUM_COLS = 16; + + @Override + protected void setup() { + Table table = new Table(); + table.setSizeFull(); + table.setColumnReorderingAllowed(true); + + for (int i = 0; i < NUM_COLS; ++i) { + table.addContainerProperty("col-" + i, String.class, null); + } + + addComponent(table); + } + + @Override + protected String getDescription() { + return "When reordering columns via drag'n'drop, the drop marker is drawn too far to the right."; + } + + @Override + protected Integer getTicketNumber() { + return 10890; + } +} -- cgit v1.2.3