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

Add support for 'px' on Length in iOS

Browse Source
This commit is contained in:
Panayot Cankov
2017-03-06 13:19:57 +02:00
parent b45cbe929b
commit 9f1ebc11ca
10 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tns-core-modules/ui/html-view/html-view.ios.ts
View File

@@ -45,11 +45,11 @@ export class HtmlView extends HtmlViewBase {
}
let nativeSize = nativeView.sizeThatFits(CGSizeMake(width, height));
let labelWidth = nativeSize.width;
let labelWidth = layout.toDevicePixels(nativeSize.width);
labelWidth = Math.min(labelWidth, width);
let measureWidth = Math.max(labelWidth, this.effectiveMinWidth);
let measureHeight = Math.max(nativeSize.height, this.effectiveMinHeight);
let measureHeight = Math.max(layout.toDevicePixels(nativeSize.height), this.effectiveMinHeight);
let widthAndState = View.resolveSizeAndState(measureWidth, width, widthMode, 0);
let heightAndState = View.resolveSizeAndState(measureHeight, height, heightMode, 0);