diff options
author | Leif Åstrand <leif@vaadin.com> | 2013-01-03 16:03:07 +0200 |
---|---|---|
committer | Leif Åstrand <leif@vaadin.com> | 2013-01-03 16:03:41 +0200 |
commit | 95d0495225c395e16081578c0d45e675aa2b751e (patch) | |
tree | 6bce57260bf57d3cd18e37d3c4b7526c4c064089 /client/src | |
parent | 58f94adca687eebc6af12dfb1413290d789a8aab (diff) | |
download | vaadin-framework-95d0495225c395e16081578c0d45e675aa2b751e.tar.gz vaadin-framework-95d0495225c395e16081578c0d45e675aa2b751e.zip |
Remember old splitter position when adjusting for out of bounds (#10596)
Change-Id: I7d37ead068b00f75d0ee70666cdc0c5fdb17b623
Diffstat (limited to 'client/src')
-rw-r--r-- | client/src/com/vaadin/client/ui/VAbstractSplitPanel.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/client/src/com/vaadin/client/ui/VAbstractSplitPanel.java b/client/src/com/vaadin/client/ui/VAbstractSplitPanel.java index 90f3e49ffb..e8732a4ca0 100644 --- a/client/src/com/vaadin/client/ui/VAbstractSplitPanel.java +++ b/client/src/com/vaadin/client/ui/VAbstractSplitPanel.java @@ -341,12 +341,16 @@ public class VAbstractSplitPanel extends ComplexPanel { } public void setSplitPosition(String pos) { + setSplitPosition(pos, true); + } + + private void setSplitPosition(String pos, boolean rememberPosition) { if (pos == null) { return; } pos = checkSplitPositionLimits(pos); - if (!pos.equals(position)) { + if (rememberPosition && !pos.equals(position)) { position = convertToPositionUnits(pos); } @@ -402,7 +406,8 @@ public class VAbstractSplitPanel extends ComplexPanel { if (pixelPosition < 0) { pixelPosition = 0; } - setSplitPosition(pixelPosition + "px"); + // Move splitter within bounds, but don't remember the new value + setSplitPosition(pixelPosition + "px", false); return; } @@ -450,7 +455,8 @@ public class VAbstractSplitPanel extends ComplexPanel { if (pixelPosition < 0) { pixelPosition = 0; } - setSplitPosition(pixelPosition + "px"); + // Move splitter within bounds, but don't remember the new value + setSplitPosition(pixelPosition + "px", false); return; } |