javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-17 04:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3785 from NativeScript/fix-ios-label

Browse Source 
FIX: IOS measure bug + livesinc
This commit is contained in:
Alexander Vakrilov
2017-03-14 14:46:26 +02:00
committed by GitHub
parent 9a051f8373 32a1a4760a
commit 0450cce77f
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tns-core-modules/application/application.ios.ts
View File

@ -215,6 +215,8 @@ exports.start = function (entry?: NavigationEntry) {
exports.mainEntry = entry; exports.mainEntry = entry;
} }
started = true;
if (!iosApp.nativeApp) { if (!iosApp.nativeApp) {
// Normal NativeScript app will need UIApplicationMain. // Normal NativeScript app will need UIApplicationMain.
UIApplicationMain(0, null, null, iosApp && iosApp.delegate ? NSStringFromClass(<any>iosApp.delegate) : NSStringFromClass(Responder)); UIApplicationMain(0, null, null, iosApp && iosApp.delegate ? NSStringFromClass(<any>iosApp.delegate) : NSStringFromClass(Responder));

2
tns-core-modules/ui/label/label.ios.ts
View File

@ -84,7 +84,7 @@ export class Label extends TextBase implements LabelDefinition {
this._fixedSize = (widthMode === layout.EXACTLY ? FixedSize.WIDTH : FixedSize.NONE) this._fixedSize = (widthMode === layout.EXACTLY ? FixedSize.WIDTH : FixedSize.NONE)
| (heightMode === layout.EXACTLY ? FixedSize.HEIGHT : FixedSize.NONE); | (heightMode === layout.EXACTLY ? FixedSize.HEIGHT : FixedSize.NONE);
let nativeSize = nativeView.sizeThatFits(CGSizeMake(width, height)); let nativeSize = nativeView.sizeThatFits(CGSizeMake(layout.toDeviceIndependentPixels(width), layout.toDeviceIndependentPixels(height)));
let labelWidth = layout.toDevicePixels(nativeSize.width); let labelWidth = layout.toDevicePixels(nativeSize.width);
if (this.textWrap) { if (this.textWrap) {