javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 03:31:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3762 from NativeScript/fix-image-scaling

Browse Source 
Fix iOS image scaling to work in px
This commit is contained in:
Panayot Cankov
2017-03-09 15:12:17 +02:00
committed by GitHub
parent 52ab556fdf aac9cc2e3e
commit 77cbf94da7
6 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
apps/app/App_Resources/iOS/icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
apps/app/App_Resources/iOS/icon@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.1 KiB

BIN
apps/app/App_Resources/iOS/icon@3x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.6 KiB

BIN
apps/app/App_Resources/iOS/testlogo.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

4
apps/app/ui-tests-app/web-view/web-view-test.xml
View File

@ -7,8 +7,8 @@
<!-- Resources: png and jpg -->
<WrapLayout>
<Image src="res://icon" stretch ="none" />
<Image src="res://testlogo" stretch ="none" />
<Image src="res://icon" stretch="none" />
<Image src="res://testlogo" stretch="none" />
</WrapLayout>
</StackLayout>

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

@ -53,8 +53,8 @@ export class Image extends ImageBase {
let height = layout.getMeasureSpecSize(heightMeasureSpec);
let heightMode = layout.getMeasureSpecMode(heightMeasureSpec);
let nativeWidth = this.imageSource ? this.imageSource.width : 0;
let nativeHeight = this.imageSource ? this.imageSource.height : 0;
let nativeWidth = this.imageSource ? layout.toDevicePixels(this.imageSource.width) : 0;
let nativeHeight = this.imageSource ? layout.toDevicePixels(this.imageSource.height) : 0;
let measureWidth = Math.max(nativeWidth, this.effectiveMinWidth);
let measureHeight = Math.max(nativeHeight, this.effectiveMinHeight);