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

feat(image-asset-ios): add autoScaleFactor option to switch auto scaling (#6127)

Browse Source
This commit is contained in:
Alexander Djenkov
2018-07-31 10:12:27 +03:00
committed by GitHub
parent 7e89f942b4
commit 81e63ee19e
5 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tns-core-modules/image-asset/image-asset-common.ts
View File

@@ -2,16 +2,16 @@ import * as definition from ".";
import * as observable from "../data/observable";
import * as platform from "../platform";
export class ImageAsset extends observable.Observable implements definition.ImageAsset {
export class ImageAsset extends observable.Observable implements definition.ImageAsset {
private _options: definition.ImageAssetOptions;
private _nativeImage: any;
ios: PHAsset;
android: string;
constructor () {
constructor() {
super();
this._options = { keepAspectRatio: true };
this._options = { keepAspectRatio: true, autoScaleFactor: true };
}
get options(): definition.ImageAssetOptions {

1
tns-core-modules/image-asset/image-asset.d.ts vendored
View File

@@ -17,4 +17,5 @@ export interface ImageAssetOptions {
width?: number;
height?: number;
keepAspectRatio?: boolean;
autoScaleFactor?: boolean;
}

9
tns-core-modules/image-asset/image-asset.ios.ts
View File

@@ -50,7 +50,7 @@ export class ImageAsset extends common.ImageAsset {
let imageRequestOptions = PHImageRequestOptions.alloc().init();
imageRequestOptions.deliveryMode = PHImageRequestOptionsDeliveryMode.HighQualityFormat;
imageRequestOptions.networkAccessAllowed = true;
PHImageManager.defaultManager().requestImageForAssetTargetSizeContentModeOptionsResultHandler(this.ios, requestedSize, PHImageContentMode.AspectFit, imageRequestOptions,
(image, imageResultInfo) => {
if (image) {
@@ -64,8 +64,11 @@ export class ImageAsset extends common.ImageAsset {
);
}
private scaleImage(image: UIImage, requestedSize: {width: number, height: number}): UIImage {
UIGraphicsBeginImageContextWithOptions(requestedSize, false, 0.0);
private scaleImage(image: UIImage, requestedSize: { width: number, height: number }): UIImage {
// scaleFactor = 0 takes the scale factor of the devices's main screen.
const scaleFactor = this.options && this.options.autoScaleFactor === false ? 1.0 : 0.0;
UIGraphicsBeginImageContextWithOptions(requestedSize, false, scaleFactor);
image.drawInRect(CGRectMake(0, 0, requestedSize.width, requestedSize.height));
let resultImage = UIGraphicsGetImageFromCurrentImageContext();
UIGraphicsEndImageContext();

2
tns-core-modules/image-source/image-source.ios.ts
View File

@@ -190,7 +190,7 @@ function getFileName(path: string): string {
return fileName;
}
function getImageData(instance: UIImage, format: "png" | "jpeg" | "jpg", quality = 1.0): NSData {
function getImageData(instance: UIImage, format: "png" | "jpeg" | "jpg", quality = 0.9): NSData {
var data = null;
switch (format) {
case "png":