src/Builder4/WindowState.vala
authorAlan Knowles <alan@roojs.com>
Thu, 26 Feb 2015 12:10:56 +0000 (20:10 +0800)
committerAlan Knowles <alan@roojs.com>
Thu, 26 Feb 2015 12:10:56 +0000 (20:10 +0800)
src/Builder4/WindowState.vala

index 26fe4b5..f2c26dc 100644 (file)
@@ -536,22 +536,29 @@ public class WindowState : Object
              case State.OBJECT:
                  var n = _this.left_tree.getActiveElement();
 
-                    if (_this.left_tree.model.file == null) {
-                        this.state = this.oldstate;
-                        this.buttonShowHide();
-                        return;
-                    }
-                    
-                    if (n == null && _this.left_tree.model.file.tree != null) {
-                        this.state = this.oldstate;
-                        this.buttonShowHide();
-                        return;
-                    }
+                if (_this.left_tree.model.file == null) {
+                    this.state = this.oldstate;
+                    this.buttonShowHide();
+                    return;
+                }
+                
+                if (n == null && _this.left_tree.model.file.tree != null) {
+                    this.state = this.oldstate;
+                    this.buttonShowHide();
+                    return;
+                }
 
+                this.rightpalete.el.show_all();
+                this.rightpalete.load(_this.left_tree.getActiveFile().palete(), n == null ? "*top" : n.fqn());
+
+                 this.win.rooview.el.save_easing_state();
+                // -- FIXME? this needs to be State aware?
+                _this.clutterembed.setSizesAlloc( "codeedit");
+                this.win.rooview.el.restore_easing_state();
 
                 
                 this.win.objectview.el.save_easing_state();
-                this.win.objectview.el.set_scale(0.0f,0.0f);
+                this.win.objectview.el.sset_scale(1.0f,1.0f);
                 this.win.objectview.el.restore_easing_state();    
                 break;