From: Jani Laakso <jani.laakso@itmill.com>
Date: Wed, 31 Oct 2007 12:50:21 +0000 (+0000)
Subject: Fixed #1026, pair-coding with Matti
X-Git-Tag: 6.7.0.beta1~5741
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c7f66c600b0df52d991be8034477f9c5462e0872;p=vaadin-framework.git

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 5e00cc5f4f..7b6b7abcd8 100644
--- 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 986d9c51ee..89f8ea186c 100644
--- 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);
+
 	}
 
 }