diff options
| author | Johannes Dahlström <johannesd@vaadin.com> | 2012-06-12 16:31:55 +0300 |
|---|---|---|
| committer | Johannes Dahlström <johannesd@vaadin.com> | 2012-06-12 16:31:55 +0300 |
| commit | 30fb43e8f437d674a750dcbc5626bd251cb5c609 (patch) | |
| tree | 8e1c869e4d5131c7aca7dd649c71e9a55d8b4cee /src/com/vaadin/terminal | |
| parent | 5fc8a1d9d0d4474af0465ecdb69bc586ab79a945 (diff) | |
| parent | 6f729f5d55cdfb719e8de835d4c713225bfd7ef2 (diff) | |
| download | vaadin-framework-30fb43e8f437d674a750dcbc5626bd251cb5c609.tar.gz vaadin-framework-30fb43e8f437d674a750dcbc5626bd251cb5c609.zip | |
Merge commit '6f729'
Conflicts:
src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java
src/com/vaadin/ui/AbstractSplitPanel.java
Diffstat (limited to 'src/com/vaadin/terminal')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java b/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java index 12ae3312c7..e112fac304 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java +++ b/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VAbstractSplitPanel.java @@ -289,12 +289,12 @@ public class VAbstractSplitPanel extends ComplexPanel { */ private String checkSplitPositionLimits(String pos) { float positionAsFloat = convertToPixels(pos); - float maximumAsFloat = convertToPixels(maximumPosition); - float minimumAsFloat = convertToPixels(minimumPosition); - if (maximumAsFloat < positionAsFloat) { + if (maximumPosition != null + && convertToPixels(maximumPosition) < positionAsFloat) { pos = maximumPosition; - } else if (minimumAsFloat > positionAsFloat) { + } else if (minimumPosition != null + && convertToPixels(minimumPosition) > positionAsFloat) { pos = minimumPosition; } return pos; |