Index indicator (while scrolling) now takes actual table height into account, not just pagelength; fixes #1848

svn changeset:4992/svn branch:trunk

1 files changed, 6 insertions, 3 deletions

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
index b668fd0fa6..231e4e6de1 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IScrollTable.java
@@ -765,12 +765,15 @@ public class IScrollTable extends Composite implements Table, ScrollListener,
                 .getElementPropertyInt(getElement(), "offsetHeight") - 2)
                 + "px");
 
-        int last = (firstRowInViewPort + pageLength);
+        // indexes go from 1-totalRows, as rowheaders in index-mode indicate
+        int last = (firstRowInViewPort + (bodyContainer.getOffsetHeight() / tBody
+                .getRowHeight()));
         if (last > totalRows) {
             last = totalRows;
         }
-        DOM.setInnerHTML(scrollPositionElement, "<span>" + firstRowInViewPort
-                + " &ndash; " + last + "..." + "</span>");
+        DOM.setInnerHTML(scrollPositionElement, "<span>"
+                + (firstRowInViewPort + 1) + " &ndash; " + last + "..."
+                + "</span>");
         DOM.setStyleAttribute(scrollPositionElement, "display", "block");
     }