From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Fri, 8 Jun 2007 06:42:14 +0000 (+0000)
Subject: orderedlayout supports also horizontal
X-Git-Tag: 6.7.0.beta1~6302
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=775e25353d750337de57bb9907c41970dbc459c8;p=vaadin-framework.git

orderedlayout supports also horizontal

svn changeset:1645/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/TkOrderedLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/TkOrderedLayout.java
index 6514075a00..419ad0a8be 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/TkOrderedLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/TkOrderedLayout.java
@@ -2,21 +2,40 @@ package com.itmill.toolkit.terminal.gwt.client.ui;
 
 import java.util.Iterator;
 
+import com.google.gwt.user.client.ui.Composite;
+import com.google.gwt.user.client.ui.HorizontalPanel;
+import com.google.gwt.user.client.ui.Panel;
+import com.google.gwt.user.client.ui.SimplePanel;
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.google.gwt.user.client.ui.Widget;
 import com.itmill.toolkit.terminal.gwt.client.Client;
 import com.itmill.toolkit.terminal.gwt.client.Paintable;
 import com.itmill.toolkit.terminal.gwt.client.UIDL;
 
-public class TkOrderedLayout extends VerticalPanel implements Paintable {
+public class TkOrderedLayout extends Composite implements Paintable {
+	
+	SimplePanel container = new SimplePanel();
+	
+	Panel panel;
+	
+	public TkOrderedLayout() {
+		initWidget(container);
+	}
 
 	public void updateFromUIDL(UIDL uidl, Client client) {
-		clear();
-		if (uidl.hasAttribute("caption")) setTitle(uidl.getStringAttribute("caption")); 
+		container.clear();
+		
+		if(uidl.getStringAttribute("orientation").equals("horizontal"))
+			panel = new HorizontalPanel();
+		else
+			panel = new VerticalPanel();
+		
+		container.add(panel);
+		
 		for (Iterator i = uidl.getChildIterator(); i.hasNext();) {
 			UIDL uidlForChild = (UIDL)i.next();
 			Widget child = client.createWidgetFromUIDL(uidlForChild);
-			add(child);
+			panel.add(child);
 		}
 	}