aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatti Tahvonen <matti.tahvonen@itmill.com>2008-06-24 13:27:03 +0000
committerMatti Tahvonen <matti.tahvonen@itmill.com>2008-06-24 13:27:03 +0000
commit095c8b6bbe04753595845a09ea80fda4f5c66490 (patch)
tree83c3c62fffb0ddea3eae82a5f8373533ff2c5225
parentd8f0fe4e20daf1392fc76b117ab37688faa8d5e1 (diff)
downloadvaadin-framework-095c8b6bbe04753595845a09ea80fda4f5c66490.tar.gz
vaadin-framework-095c8b6bbe04753595845a09ea80fda4f5c66490.zip
fixes #1834. Tested only a bit with FF & SA.
svn changeset:4948/svn branch:trunk
-rw-r--r--src/com/itmill/toolkit/tests/tickets/Ticket1834PanelScrolling.java1
-rw-r--r--src/com/itmill/toolkit/ui/Panel.java8
2 files changed, 5 insertions, 4 deletions
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1834PanelScrolling.java b/src/com/itmill/toolkit/tests/tickets/Ticket1834PanelScrolling.java
index 5dabc86e83..312c8ca5cb 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1834PanelScrolling.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1834PanelScrolling.java
@@ -68,6 +68,7 @@ public class Ticket1834PanelScrolling extends com.itmill.toolkit.Application {
main.addComponent(b);
p = new Panel("TestPanel");
+ p.setScrollable(true);
for (int i = 0; i < ROWS; i++) {
p
diff --git a/src/com/itmill/toolkit/ui/Panel.java b/src/com/itmill/toolkit/ui/Panel.java
index 162e59a3fe..6359687c3c 100644
--- a/src/com/itmill/toolkit/ui/Panel.java
+++ b/src/com/itmill/toolkit/ui/Panel.java
@@ -176,8 +176,8 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
}
if (isScrollable()) {
- target.addVariable(this, "scrollleft", getScrollLeft());
- target.addVariable(this, "scrolltop", getScrollTop());
+ target.addVariable(this, "scrollLeft", getScrollLeft());
+ target.addVariable(this, "scrollTop", getScrollTop());
}
if (actionHandlers != null && !actionHandlers.isEmpty()) {
@@ -292,8 +292,8 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
}
// Scrolling
- final Integer newScrollX = (Integer) variables.get("scrollleft");
- final Integer newScrollY = (Integer) variables.get("scrolltop");
+ final Integer newScrollX = (Integer) variables.get("scrollLeft");
+ final Integer newScrollY = (Integer) variables.get("scrollTop");
if (newScrollX != null && newScrollX.intValue() != getScrollLeft()) {
// set internally, not to fire request repaint
scrollOffsetX = newScrollX.intValue();