Fixed #1026, pair-coding with Matti

svn changeset:2635/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java
index 5e00cc5f4f65de7842379108c42222ce3bb8bf44..7b6b7abcd892dd21a0544edc8e8832a490f34998 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISplitPanel.java
@@ -186,6 +186,7 @@ public class ISplitPanel extends ComplexPanel implements Paintable,
                        pixelPosition = DOM.getElementPropertyInt(splitter, "offsetTop");
 
                        // reposition splitter in case it is out of box
+                       int pixelSize = getSplitterSize();
                        if (pixelPosition > 0
                                        && pixelPosition + getSplitterSize() > wholeSize) {
                                pixelPosition = wholeSize - getSplitterSize();
@@ -326,8 +327,17 @@ public class ISplitPanel extends ComplexPanel implements Paintable,
        private int getSplitterSize() {
                if (splitterSize < 0) {
                        if (isAttached()) {
-                               splitterSize = DOM.getElementPropertyInt(splitter,
-                                               "offsetWidth");
+                               switch (orientation) {
+                               case ORIENTATION_HORIZONTAL:
+                                       splitterSize = DOM.getElementPropertyInt(splitter,
+                                                       "offsetWidth");
+                                       break;
+
+                               default:
+                                       splitterSize = DOM.getElementPropertyInt(splitter,
+                                                       "offsetHeight");
+                                       break;
+                               }
                        }
                }
                return splitterSize;

diff --git a/src/com/itmill/toolkit/tests/TestSplitPanel.java b/src/com/itmill/toolkit/tests/TestSplitPanel.java
index 986d9c51ee6ca7c9ed49da966ff3e86d0bc625dc..89f8ea186c73e73850671091a6452a00414eada9 100644 (file)
--- a/src/com/itmill/toolkit/tests/TestSplitPanel.java
+++ b/src/com/itmill/toolkit/tests/TestSplitPanel.java
@@ -4,24 +4,19 @@ import com.itmill.toolkit.ui.*;
 
 public class TestSplitPanel extends com.itmill.toolkit.Application {
 
-       SplitPanel horizontalSplit = new SplitPanel(
-                       SplitPanel.ORIENTATION_HORIZONTAL);
-       // this works
-       //SplitPanel verticalSplit = new SplitPanel(SplitPanel.ORIENTATION_HORIZONTAL);
-       // TODO: this does NOT work
+       // SplitPanel verticalSplit = new
+       // SplitPanel(SplitPanel.ORIENTATION_HORIZONTAL);
        SplitPanel verticalSplit = new SplitPanel(SplitPanel.ORIENTATION_VERTICAL);
-       
+
        public void init() {
                Window mainWindow = new Window("Feature Browser");
                setMainWindow(mainWindow);
-               
+
                verticalSplit.setFirstComponent(new Label("vertical first"));
                verticalSplit.setSecondComponent(new Label("vertical second"));
-               
-//             horizontalSplit.setFirstComponent(new Label("horizontal first"));
-//             horizontalSplit.setSecondComponent(new Label("horizontal second"));
 
                mainWindow.setLayout(verticalSplit);
+
        }
 
 }