phosphor-splitpanel
Advanced tools
Comparing version 0.9.3 to 0.9.4
@@ -250,5 +250,4 @@ import { Message } from 'phosphor-messaging'; | ||
private _pendingSizes; | ||
private _box; | ||
private _sizers; | ||
private _pressData; | ||
} |
@@ -72,3 +72,2 @@ /*----------------------------------------------------------------------------- | ||
this._pendingSizes = false; | ||
this._box = null; | ||
this._sizers = []; | ||
@@ -232,3 +231,3 @@ this._pressData = null; | ||
phosphor_messaging_1.postMessage(this, phosphor_widget_1.MSG_LAYOUT_REQUEST); | ||
phosphor_widget_1.clearLayoutGeometry(msg.child); | ||
msg.child.clearOffsetGeometry(); | ||
}; | ||
@@ -278,12 +277,9 @@ /** | ||
if (this.isVisible) { | ||
var width = msg.width; | ||
var height = msg.height; | ||
if (width < 0 || height < 0) { | ||
var geo = phosphor_widget_1.getLayoutGeometry(this); | ||
if (width < 0) | ||
width = geo ? geo.width : this.node.offsetWidth; | ||
if (height < 0) | ||
height = geo ? geo.height : this.node.offsetHeight; | ||
if (msg.width < 0 || msg.height < 0) { | ||
var rect = this.offsetRect; | ||
this._layoutChildren(rect.width, rect.height); | ||
} | ||
this._layoutChildren(width, height); | ||
else { | ||
this._layoutChildren(msg.width, msg.height); | ||
} | ||
} | ||
@@ -296,6 +292,4 @@ }; | ||
if (this.isVisible) { | ||
var geo = phosphor_widget_1.getLayoutGeometry(this); | ||
var width = geo ? geo.width : this.node.offsetWidth; | ||
var height = geo ? geo.height : this.node.offsetHeight; | ||
this._layoutChildren(width, height); | ||
var rect = this.offsetRect; | ||
this._layoutChildren(rect.width, rect.height); | ||
} | ||
@@ -352,3 +346,3 @@ }; | ||
} | ||
var limits = phosphor_domutil_1.sizeLimits(widget.node); | ||
var limits = widget.sizeLimits; | ||
sizer.stretch = SplitPanel.getStretch(widget); | ||
@@ -377,3 +371,3 @@ sizer.minSize = limits.minWidth; | ||
} | ||
var limits = phosphor_domutil_1.sizeLimits(widget.node); | ||
var limits = widget.sizeLimits; | ||
sizer.stretch = SplitPanel.getStretch(widget); | ||
@@ -389,3 +383,3 @@ sizer.minSize = limits.minHeight; | ||
// Add the box sizing to the size constraints. | ||
var box = this._box = phosphor_domutil_1.boxSizing(this.node); | ||
var box = this.boxSizing; | ||
minW += box.horizontalSum; | ||
@@ -395,8 +389,4 @@ minH += box.verticalSum; | ||
maxH += box.verticalSum; | ||
// Update the inline style size constraints. | ||
var style = this.node.style; | ||
style.minWidth = minW + 'px'; | ||
style.minHeight = minH + 'px'; | ||
style.maxWidth = maxW < Infinity ? maxW + 'px' : ''; | ||
style.maxHeight = maxH < Infinity ? maxH + 'px' : ''; | ||
// Update the panel's size constraints. | ||
this.setSizeLimits(minW, minH, maxW, maxH); | ||
// Notifiy the parent that it should relayout. | ||
@@ -416,5 +406,4 @@ if (this.parent) | ||
} | ||
// Ensure the box sizing is computed for the panel. | ||
var box = this._box || (this._box = phosphor_domutil_1.boxSizing(this.node)); | ||
// Compute the actual layout bounds adjusted for border and padding. | ||
var box = this.boxSizing; | ||
var top = box.paddingTop; | ||
@@ -446,3 +435,3 @@ var left = box.paddingLeft; | ||
var hStyle = getHandle(widget).node.style; | ||
phosphor_widget_1.setLayoutGeometry(widget, left, top, size, height); | ||
widget.setOffsetGeometry(left, top, size, height); | ||
hStyle.top = top + 'px'; | ||
@@ -464,3 +453,3 @@ hStyle.left = left + size + 'px'; | ||
var hStyle = getHandle(widget).node.style; | ||
phosphor_widget_1.setLayoutGeometry(widget, left, top, width, size); | ||
widget.setOffsetGeometry(left, top, width, size); | ||
hStyle.top = top + size + 'px'; | ||
@@ -467,0 +456,0 @@ hStyle.left = left + 'px'; |
{ | ||
"name": "phosphor-splitpanel", | ||
"version": "0.9.3", | ||
"version": "0.9.4", | ||
"description": "A Phosphor layout widget which arranges its children into resizable sections.", | ||
@@ -11,7 +11,7 @@ "main": "lib/index.js", | ||
"phosphor-disposable": "^1.0.2", | ||
"phosphor-domutil": "^0.9.2", | ||
"phosphor-domutil": "^0.9.4", | ||
"phosphor-messaging": "^1.0.3", | ||
"phosphor-nodewrapper": "^1.0.2", | ||
"phosphor-properties": "^1.1.0", | ||
"phosphor-widget": "^0.9.6" | ||
"phosphor-widget": "^0.9.8" | ||
}, | ||
@@ -44,3 +44,3 @@ "devDependencies": { | ||
"build:css": "node scripts/copycss.js", | ||
"build:example": "tsc --project example && browserify -g browserify-css example/index.js -o example/bundle.js", | ||
"build:example": "tsc --project example && browserify -t browserify-css example/index.js -o example/bundle.js", | ||
"build": "npm run build:src && npm run build:test && npm run build:css", | ||
@@ -65,2 +65,5 @@ "docs": "rimraf docs/api && typedoc --options scripts/tdoptions.json", | ||
], | ||
"browserify": { | ||
"transform": ["browserify-css"] | ||
}, | ||
"keywords": [ | ||
@@ -67,0 +70,0 @@ "ui", |
@@ -102,3 +102,3 @@ phosphor-splitpanel | ||
npm install --save-dev browserify browserify-css | ||
browserify -g browserify-css myapp.js -o mybundle.js | ||
browserify myapp.js -o mybundle.js | ||
``` | ||
@@ -105,0 +105,0 @@ |
44900
1139
Updatedphosphor-domutil@^0.9.4
Updatedphosphor-widget@^0.9.8