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

Merge pull request #2198 from NativeScript/cankov/image-exactly

Browse Source 
Image should not requestLayout when measured with 'exactly' spec
This commit is contained in:
Panayot Cankov
2016-05-30 08:57:53 +03:00
parent 221daeb561 717b5131b1
commit ef7151dce8
9 changed files with 272 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tns-core-modules/platform/platform.android.ts
View File

@@ -133,3 +133,5 @@ export var device: definition.Device = new Device();
export module screen {
export var mainScreen = new MainScreen();
}
export var isAndroid = true;

10
tns-core-modules/platform/platform.d.ts vendored
View File

@@ -3,6 +3,16 @@
* Contains all kinds of information about the device, its operating system and software.
*/
declare module "platform" {
/**
* Gets a value indicating if the app is running on the Android platform.
*/
export var isAndroid: boolean;
/**
* Gets a value indicating if the app is running on the iOS platform.
*/
export var isIOS: boolean;
/*
* Enum holding platform names.

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

@@ -126,3 +126,5 @@ export var device: definition.Device = new Device();
export module screen {
export var mainScreen = new MainScreen();
}
export var isIOS = true;

7
tns-core-modules/ui/image/image.ios.ts
View File

@@ -36,6 +36,7 @@ function onImageSourcePropertyChanged(data: dependencyObservable.PropertyChangeD
export class Image extends imageCommon.Image {
private _ios: UIImageView;
private _imageSourceAffectsLayout: boolean = true;
constructor() {
super();
@@ -54,7 +55,7 @@ export class Image extends imageCommon.Image {
public _setNativeImage(nativeImage: any) {
this.ios.image = nativeImage;
if (isNaN(this.width) || isNaN(this.height)) {
if (this._imageSourceAffectsLayout) {
this.requestLayout();
}
}
@@ -77,7 +78,9 @@ export class Image extends imageCommon.Image {
var finiteWidth: boolean = widthMode !== utils.layout.UNSPECIFIED;
var finiteHeight: boolean = heightMode !== utils.layout.UNSPECIFIED;
this._imageSourceAffectsLayout = widthMode !== utils.layout.EXACTLY || heightMode !== utils.layout.EXACTLY;
if (nativeWidth !== 0 && nativeHeight !== 0 && (finiteWidth || finiteHeight)) {
var scale = Image.computeScaleFactor(width, height, finiteWidth, finiteHeight, nativeWidth, nativeHeight, this.stretch);
var resultW = Math.floor(nativeWidth * scale.width);