Merge pull request #581 from dsych/cachedLayout

Luke Pacholski · web-flow · commit 3ea5fc41cc07 · 2017-02-14T11:02:43.000-08:00
Issue adobe#1154@thimble.mozilla.org
diff --git a/src/extensions/default/bramble/lib/UI.js b/src/extensions/default/bramble/lib/UI.js
@@ -108,11 +108,18 @@ define(function (require, exports, module) {
             }
         }
 
+        var secondPaneWidth = BrambleStartupState.ui("secondPaneWidth");
         var firstPaneWidth = BrambleStartupState.ui("firstPaneWidth");
+                         
+        firstPaneWidth = firstPaneWidth * 100 / (
+                         ((firstPaneWidth)? firstPaneWidth : 0) +
+                         ((secondPaneWidth)? secondPaneWidth : 0)); // calculate width in %
+        
         if(firstPaneWidth) {
-            $("#first-pane").width(firstPaneWidth);
+            $("#first-pane").width((firstPaneWidth + "%"));
         }
 
+
         var fontSize = BrambleStartupState.ui("fontSize");
         if(fontSize && /\d+px/.test(fontSize)) {
             ViewCommandHandlers.setFontSize(fontSize);

Original file line number	Diff line number	Diff line change
`@@ -108,11 +108,18 @@ define(function (require, exports, module) {`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`
	`111`	`+ var secondPaneWidth = BrambleStartupState.ui("secondPaneWidth");`
`111`	`112`	`var firstPaneWidth = BrambleStartupState.ui("firstPaneWidth");`
	`113`	`+`
	`114`	`+ firstPaneWidth = firstPaneWidth * 100 / (`
	`115`	`+ ((firstPaneWidth)? firstPaneWidth : 0) +`
	`116`	`+ ((secondPaneWidth)? secondPaneWidth : 0)); // calculate width in %`
	`117`	`+`
`112`	`118`	`if(firstPaneWidth) {`
`113`		`- $("#first-pane").width(firstPaneWidth);`
	`119`	`+ $("#first-pane").width((firstPaneWidth + "%"));`
`114`	`120`	`}`
`115`	`121`
	`122`	`+`
`116`	`123`	`var fontSize = BrambleStartupState.ui("fontSize");`
`117`	`124`	`if(fontSize && /\d+px/.test(fontSize)) {`
`118`	`125`	`ViewCommandHandlers.setFontSize(fontSize);`