aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels')
-rwxr-xr-xjs/panels/Splitter.js11
-rw-r--r--js/panels/presets/content.reel/content.css4
2 files changed, 9 insertions, 6 deletions
diff --git a/js/panels/Splitter.js b/js/panels/Splitter.js
index 3215e928..a396ea28 100755
--- a/js/panels/Splitter.js
+++ b/js/panels/Splitter.js
@@ -66,6 +66,7 @@ exports.Splitter = Montage.create(Component, {
66 var storedData = this.application.localStorage.getItem(this.element.getAttribute("data-montage-id")); 66 var storedData = this.application.localStorage.getItem(this.element.getAttribute("data-montage-id"));
67 if(storedData && this.element.getAttribute("data-montage-id") !== null) { 67 if(storedData && this.element.getAttribute("data-montage-id") !== null) {
68 this._collapsed = storedData.value; 68 this._collapsed = storedData.value;
69
69 } else { 70 } else {
70 this._collapsed = false; 71 this._collapsed = false;
71 } 72 }
@@ -77,13 +78,11 @@ exports.Splitter = Montage.create(Component, {
77 draw: { 78 draw: {
78 value: function() { 79 value: function() {
79 if(this.collapsed) { 80 if(this.collapsed) {
80
81 if(this.panel.element) this.panel.element.classList.add("collapsed"); 81 if(this.panel.element) this.panel.element.classList.add("collapsed");
82 else this.panel.classList.add("collapsed"); 82 else this.panel.classList.add("collapsed");
83 this.element.classList.add("collapsed"); 83 this.element.classList.add("collapsed");
84 if(this._resizeBar != null) this.resizeBar.classList.add("collapsed"); 84 if(this._resizeBar != null) this.resizeBar.classList.add("collapsed");
85 } 85 } else {
86 else {
87 if(this.panel.element) this.panel.element.classList.remove("collapsed"); 86 if(this.panel.element) this.panel.element.classList.remove("collapsed");
88 else this.panel.classList.remove("collapsed"); 87 else this.panel.classList.remove("collapsed");
89 this.element.classList.remove("collapsed"); 88 this.element.classList.remove("collapsed");
@@ -92,6 +91,12 @@ exports.Splitter = Montage.create(Component, {
92 } 91 }
93 }, 92 },
94 93
94 didDraw: {
95 value: function() {
96 this.application.ninja.stage.resizeCanvases = true;
97 }
98 },
99
95 handleClick : { 100 handleClick : {
96 value: function() { 101 value: function() {
97 if (!this.disabled) { 102 if (!this.disabled) {
diff --git a/js/panels/presets/content.reel/content.css b/js/panels/presets/content.reel/content.css
index c0ccbad4..409e1960 100644
--- a/js/panels/presets/content.reel/content.css
+++ b/js/panels/presets/content.reel/content.css
@@ -10,9 +10,7 @@
10 -webkit-box-orient: vertical; 10 -webkit-box-orient: vertical;
11 -webkit-box-flex: 1; 11 -webkit-box-flex: 1;
12} 12}
13.presetsPanel .treeRoot { 13
14 margin: 0 8px;
15}
16.tab-bar { 14.tab-bar {
17 -webkit-box-flex: 0; 15 -webkit-box-flex: 0;
18 background-color: #282828; 16 background-color: #282828;