Skip to content

Z
zeroing-engine
Commit 92cbdee6 authored by rockyl's avatar rockyl
Browse files
Options

Merge remote-tracking branch 'origin/designtime' into designtime 

# Conflicts:
#	src/zeroing/decorators/AlignManager.ts
parents 40b3a224 669ce07b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 9 deletions
.idea/workspace.xml
View file @ 92cbdee6
......@@ -2,9 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="af35c04f-08f6-48ed-85db-2f94c60e87fd" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/zeroing/decorators/AlignManager.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/zeroing/decorators/AlignManager.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/zeroing/decorators/auto-adjust.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/zeroing/decorators/auto-adjust.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -286,10 +284,11 @@
<screen x="1680" y="-229" width="1920" height="1177" />
</state>
<state x="2327" y="157" key="git4idea.merge.GitPullDialog/35.23.1645.1027/1680.-229.1920.1177@1680.-229.1920.1177" timestamp="1587714144888" />
<state x="2305" y="36" width="670" height="676" key="search.everywhere.popup" timestamp="1590057778157">
<screen x="1680" y="-229" width="1920" height="1177" />
<state x="2305" y="66" width="670" height="676" key="search.everywhere.popup" timestamp="1590635743033">
<screen x="1680" y="-199" width="1920" height="1177" />
</state>
<state x="2305" y="18" width="670" height="690" key="search.everywhere.popup/0.0.1680.1050/1680.-252.1920.1200@1680.-252.1920.1200" timestamp="1587713287518" />
<state x="2305" y="66" width="670" height="676" key="search.everywhere.popup/35.23.1645.1027/1680.-199.1920.1177@1680.-199.1920.1177" timestamp="1590635743033" />
<state x="2305" y="36" width="670" height="676" key="search.everywhere.popup/35.23.1645.1027/1680.-229.1920.1177@1680.-229.1920.1177" timestamp="1590057778157" />
<state x="570" y="254" width="670" height="590" key="search.everywhere.popup/35.23.1645.1027/1680.-229.1920.1177@35.23.1645.1027" timestamp="1587004990635" />
<state x="570" y="254" width="670" height="590" key="search.everywhere.popup/35.23.1645.1027@35.23.1645.1027" timestamp="1589767535433" />
......
debug/engine.js
View file @ 92cbdee6
......@@ -1952,7 +1952,7 @@ var tslib = {__extends: __extends,__assign: __assign,__rest: __rest,__decorate:
return;
var percentWidth = that.percentWidth, percentHeight = that.percentHeight, top = that.top, bottom = that.bottom, left = that.left, right = that.right, percentTop = that.percentTop, percentBottom = that.percentBottom, percentLeft = that.percentLeft, percentRight = that.percentRight, horizonCenter = that.horizonCenter, verticalCenter = that.verticalCenter;
var _a = that._width, tW_Z = _a === void 0 ? 0 : _a, _b = that._height, tH_Z = _b === void 0 ? 0 : _b;
if (that._instanceType == "TextFieldNode") {
if (that._instanceType == "TextFieldNode" || that._instanceType == "Label") {
tW_Z = that.width;
tH_Z = that.height;
}
......@@ -2004,7 +2004,7 @@ var tslib = {__extends: __extends,__assign: __assign,__rest: __rest,__decorate:
if (toBoolean(that.children[i].right))
continue;
var _x = that.children[i].x || 0;
var _w = (that._instanceType == "TextFieldNode") ? that.width : (that.children[i].__width || 0);
var _w = (that._instanceType == "TextFieldNode" || that._instanceType == "Label") ? that.width : (that.children[i].__width || 0);
(_x + _w > maxR) ? maxR = _x + _w : 0;
}
that.width = maxR;
......@@ -2017,7 +2017,7 @@ var tslib = {__extends: __extends,__assign: __assign,__rest: __rest,__decorate:
if (toBoolean(that.children[i].bottom))
continue;
var _y = that.children[i].y || 0;
var _h = (that._instanceType == "TextFieldNode") ? that.height : (that.children[i].__height || 0);
var _h = (that._instanceType == "TextFieldNode" || that._instanceType == "Label") ? that.height : (that.children[i].__height || 0);
(_y + _h > maxB) ? maxB = _y + _h : 0;
}
that.height = maxB;
......
debug/engine.js.map
View file @ 92cbdee6
This diff is collapsed.
src/zeroing/decorators/AlignManager.ts
View file @ 92cbdee6
......@@ -57,7 +57,7 @@ class AlignManager {
} = that;
let {_width: tW_Z = 0, _height: tH_Z = 0} = that;
if (that._instanceType == "Label") {
if (that._instanceType == "TextFieldNode" || that._instanceType == "Label") {
tW_Z = that.width;
tH_Z = that.height;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment