diff options
| author | Artur Signell <artur.signell@itmill.com> | 2011-08-16 10:03:49 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2011-08-16 10:03:49 +0000 |
| commit | 3f3682c8315a56f54f2e3260cd5b76741eca3d91 (patch) | |
| tree | f140a260927c5001fa14474355e608bc6d895228 | |
| parent | aa26eef81d2f829f62afab32ce7a2d962bdeb17f (diff) | |
| download | vaadin-framework-3f3682c8315a56f54f2e3260cd5b76741eca3d91.tar.gz vaadin-framework-3f3682c8315a56f54f2e3260cd5b76741eca3d91.zip | |
Formatted source
svn changeset:20410/svn branch:6.6
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java index a5411fa0e7..3200b197de 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java @@ -806,8 +806,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); @@ -2578,7 +2578,8 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, columnTotalWidth += w.getOffsetWidth(); } - if (cell == lastcell && columnSelector.getOffsetWidth() > 0 + if (cell == lastcell + && columnSelector.getOffsetWidth() > 0 && columnTotalWidth >= div.getOffsetWidth() - columnSelector.getOffsetWidth() && !hasVerticalScrollbar()) { @@ -5077,8 +5078,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, if (totalUndefinedNaturalWidths != 0) { // divide relatively to natural column widths newSpace = Math.round(w + (float) extraSpace - * (float) w - / totalUndefinedNaturalWidths); + * (float) w / totalUndefinedNaturalWidths); } else { newSpace = w; } @@ -5978,7 +5978,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, private boolean hasHorizontalScrollbar() { return scrollBody.getOffsetWidth() > scrollBodyPanel.getOffsetWidth(); } - + private boolean hasVerticalScrollbar() { return scrollBody.getOffsetHeight() > scrollBodyPanel.getOffsetHeight(); } |