aboutsummaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorJonatan Kronqvist <jonatan.kronqvist@itmill.com>2011-08-01 09:02:40 +0000
committerJonatan Kronqvist <jonatan.kronqvist@itmill.com>2011-08-01 09:02:40 +0000
commitee35e937cd4a55482c976ac87b445e660ecea75c (patch)
tree260fdb982e2d07719c67ef4ca025f59327ec97ac /src/com
parent0bbe3dc6d59033a3a8c090832dcb1d8d7878df45 (diff)
downloadvaadin-framework-ee35e937cd4a55482c976ac87b445e660ecea75c.tar.gz
vaadin-framework-ee35e937cd4a55482c976ac87b445e660ecea75c.zip
Fixed #7340 - rendering bug when first sorting a column
svn changeset:20046/svn branch:6.7
Diffstat (limited to 'src/com')
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index 584ab02452..3436216660 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@ -383,6 +383,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
private int firstvisible = 0;
private boolean sortAscending;
private String sortColumn;
+ private String oldSortColumn;
private boolean columnReordering;
/**
@@ -809,8 +810,8 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
if (BrowserInfo.get().isIE8() && !enabled) {
/*
- * The disabled shim will not cover the table body if it is
- * relative in IE8. See #7324
+ * The disabled shim will not cover the table body if it is relative
+ * in IE8. See #7324
*/
scrollBodyPanel.getElement().getStyle()
.setPosition(Position.STATIC);
@@ -950,6 +951,8 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
.getIntAttribute("tabindex") : 0;
setProperTabIndex();
+ resizeSortedColumnForSortIndicator();
+
rendering = false;
headerChangedDuringUpdate = false;
@@ -1041,12 +1044,14 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
}
private void updateSortingProperties(UIDL uidl) {
- String oldSortColumn = sortColumn;
+ oldSortColumn = sortColumn;
if (uidl.hasVariable("sortascending")) {
sortAscending = uidl.getBooleanVariable("sortascending");
sortColumn = uidl.getStringVariable("sortcolumn");
}
+ }
+ private void resizeSortedColumnForSortIndicator() {
// Force recalculation of the captionContainer element inside the header
// cell to accomodate for the size of the sort arrow.
HeaderCell sortedHeader = tHead.getHeaderCell(sortColumn);