javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: wrap layout

Browse Source
This commit is contained in:
Vasil Chimev
2018-07-27 05:07:53 +03:00
committed by Martin Yankov
parent 5c748b9ca7
commit d6f29dc6bc
1 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tns-core-modules/ui/layouts/wrap-layout/wrap-layout.ios.ts
View File

@@ -130,18 +130,10 @@ export class WrapLayout extends WrapLayoutBase {
let childLeft = paddingLeft; let childLeft = paddingLeft;
let childTop = paddingTop; let childTop = paddingTop;
let childrenHeight = bottom - top - paddingBottom;
let childrenWidth = right - left - paddingRight;
let rowOrColumn = 0;
let childrenWidth: number;
let childrenHeight: number;
if (isVertical) {
childrenHeight = right - left - paddingRight;
childrenWidth = bottom - top - paddingBottom;
} else {
childrenHeight = bottom - top - paddingBottom;
childrenWidth = right - left - paddingRight;
}
var rowOrColumn = 0;
this.eachLayoutChild((child, last) => { this.eachLayoutChild((child, last) => {
// Add margins because layoutChild will sustract them. // Add margins because layoutChild will sustract them.
// * density converts them to device pixels. // * density converts them to device pixels.
@@ -153,7 +145,7 @@ export class WrapLayout extends WrapLayoutBase {
childWidth = length; childWidth = length;
childHeight = this.effectiveItemHeight > 0 ? this.effectiveItemHeight : childHeight; childHeight = this.effectiveItemHeight > 0 ? this.effectiveItemHeight : childHeight;
let isFirst = childTop === paddingTop; let isFirst = childTop === paddingTop;
if (childTop + childHeight > childrenWidth && childLeft + childWidth <= childrenHeight) { if (childTop + childHeight > childrenHeight && childLeft + childWidth <= childrenWidth) {
// Move to top. // Move to top.
childTop = paddingTop; childTop = paddingTop;
@@ -169,17 +161,16 @@ export class WrapLayout extends WrapLayoutBase {
childWidth = this._lengths[isFirst ? rowOrColumn - 1 : rowOrColumn]; childWidth = this._lengths[isFirst ? rowOrColumn - 1 : rowOrColumn];
} }
if (childLeft < childrenHeight && childTop < childrenWidth) { if (childLeft < childrenWidth && childTop < childrenHeight) {
View.layoutChild(this, child, childLeft, childTop, childLeft + childWidth, childTop + childHeight); View.layoutChild(this, child, childLeft, childTop, childLeft + childWidth, childTop + childHeight);
} }
// Move next child Left position to right. // Move next child Top position to bottom.
childTop += childHeight; childTop += childHeight;
} else { } else {
childWidth = this.effectiveItemWidth > 0 ? this.effectiveItemWidth : childWidth; childWidth = this.effectiveItemWidth > 0 ? this.effectiveItemWidth : childWidth;
childHeight = length; childHeight = length;
let isFirst = childLeft === paddingLeft; let isFirst = childLeft === paddingLeft;
if (childLeft + childWidth > childrenWidth && childTop + childHeight <= childrenHeight) { if (childLeft + childWidth > childrenWidth && childTop + childHeight <= childrenHeight) {
// Move to left. // Move to left.
childLeft = paddingLeft; childLeft = paddingLeft;