Commit 3cf83b73 authored by haiyoucuv's avatar haiyoucuv

1

parent 8e410772
...@@ -3,10 +3,7 @@ ...@@ -3,10 +3,7 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="af35c04f-08f6-48ed-85db-2f94c60e87fd" name="Default Changelist" comment=""> <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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/debug/engine.js" beforeDir="false" afterPath="$PROJECT_DIR$/debug/engine.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/debug/engine.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/debug/engine.js.map" 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/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> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
...@@ -175,7 +172,7 @@ ...@@ -175,7 +172,7 @@
<workItem from="1589888428282" duration="5840000" /> <workItem from="1589888428282" duration="5840000" />
<workItem from="1589990226868" duration="35000" /> <workItem from="1589990226868" duration="35000" />
<workItem from="1590026135813" duration="6205000" /> <workItem from="1590026135813" duration="6205000" />
<workItem from="1590111768143" duration="4117000" /> <workItem from="1590111768143" duration="4816000" />
</task> </task>
<task id="LOCAL-00001" summary="11"> <task id="LOCAL-00001" summary="11">
<created>1590043861171</created> <created>1590043861171</created>
......
...@@ -1923,7 +1923,7 @@ var tslib = {__extends: __extends,__assign: __assign,__rest: __rest,__decorate: ...@@ -1923,7 +1923,7 @@ var tslib = {__extends: __extends,__assign: __assign,__rest: __rest,__decorate:
var _right = judgePR ? percentRight / 100 * pW_Z : right; var _right = judgePR ? percentRight / 100 * pW_Z : right;
var _top = judgePT ? percentTop / 100 * pH_Z : top; var _top = judgePT ? percentTop / 100 * pH_Z : top;
var _bottom = judgePB ? percentBottom / 100 * pH_Z : bottom; var _bottom = judgePB ? percentBottom / 100 * pH_Z : bottom;
if (tt(_left, _right)) { if (toBoolean(_left) && toBoolean(_right)) {
that.x = _left; that.x = _left;
that.width = pW_Z - _left - _right; that.width = pW_Z - _left - _right;
} }
...@@ -1994,17 +1994,6 @@ var tslib = {__extends: __extends,__assign: __assign,__rest: __rest,__decorate: ...@@ -1994,17 +1994,6 @@ var tslib = {__extends: __extends,__assign: __assign,__rest: __rest,__decorate:
}; };
return AlignManager; return AlignManager;
}()); }());
function tt() {
var v = [];
for (var _i = 0; _i < arguments.length; _i++) {
v[_i] = arguments[_i];
}
for (var i = 0; i < v.length; i++) {
if (!toBoolean(v[i]))
return false;
}
return true;
}
var alignMgr = new AlignManager(); var alignMgr = new AlignManager();
function applyAutoAdjust(ctor) { function applyAutoAdjust(ctor) {
......
This diff is collapsed.
...@@ -84,7 +84,7 @@ class AlignManager { ...@@ -84,7 +84,7 @@ class AlignManager {
/** /**
* 计算 width 和 x 值 * 计算 width 和 x 值
*/ */
if (tt(_left, _right)) { // _left _right 都有则直接拉伸或缩小 if (toBoolean(_left) && toBoolean(_right)) { // _left _right 都有则直接拉伸或缩小
that.x = _left; that.x = _left;
......
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