Sampler layout structure change; tree position no longer changes

svn changeset:6644/svn branch:trunk

diff --git a/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java b/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java
index 46d79a075869f178c2a42193bbf0e20119ee39a0..b2102c1741a8f84f82be07b4b096e379570e99de 100644 (file)
--- a/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java
+++ b/src/com/itmill/toolkit/demo/sampler/SamplerApplication.java
@@ -203,7 +203,7 @@ public class SamplerApplication extends Application {
             nav.setComponentAlignment(b, Alignment.MIDDLE_LEFT);
 
             // togglebar
-            mainExpand.addComponent(toggleBar);
+            // mainExpand.addComponent(toggleBar);
             toggleBar.setHeight("40px");
             toggleBar.setWidth("100%");
             toggleBar.setStyleName("togglebar");
@@ -216,12 +216,19 @@ public class SamplerApplication extends Application {
             mainExpand.addComponent(mainSplit);
             mainExpand.setExpandRatio(mainSplit, 1);
 
+            VerticalLayout rightLayout = new VerticalLayout();
+            rightLayout.setSizeFull();
+            rightLayout.addComponent(toggleBar);
+
             // Menu tree, initially hidden
             navigationTree = createMenuTree();
             mainSplit.addComponent(navigationTree);
 
             // Main Area
-            mainSplit.addComponent(mainArea);
+            mainSplit.addComponent(rightLayout);
+
+            rightLayout.addComponent(mainArea);
+            rightLayout.setExpandRatio(mainArea, 1);
 
             // Show / hide tree
             Component treeSwitch = createTreeSwitch();