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

Move the effective* values from style to this

Browse Source
This commit is contained in:
Panayot Cankov
2016-12-27 10:30:19 +02:00
parent fbb756e524
commit 70cc1dd5d9
23 changed files with 254 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tns-core-modules/ui/scroll-view/scroll-view.ios.ts
View File

@@ -103,10 +103,9 @@ export class ScrollView extends ScrollViewBase {
const density = layout.getDisplayDensity();
const child = this.layoutView;
const style = this.style;
if (!child) {
this._contentMeasuredWidth = style.effectiveMinWidth * density;
this._contentMeasuredHeight = style.effectiveMinHeight * density;
this._contentMeasuredWidth = this.effectiveMinWidth * density;
this._contentMeasuredHeight = this.effectiveMinHeight * density;
}
else {
let childSize: { measuredWidth: number; measuredHeight: number };
@@ -118,8 +117,8 @@ export class ScrollView extends ScrollViewBase {
}
this.nativeView.contentSize = CGSizeMake(childSize.measuredWidth, childSize.measuredHeight);
this._contentMeasuredWidth = Math.max(childSize.measuredWidth, style.effectiveMinWidth * density);
this._contentMeasuredHeight = Math.max(childSize.measuredHeight, style.effectiveMinHeight * density);
this._contentMeasuredWidth = Math.max(childSize.measuredWidth, this.effectiveMinWidth * density);
this._contentMeasuredHeight = Math.max(childSize.measuredHeight, this.effectiveMinHeight * density);
}
const widthAndState = View.resolveSizeAndState(this._contentMeasuredWidth, width, widthMode, 0);