FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Added missing property getters in iOS View class · NativeScript/NativeScript@f15f86a · GitHub

/ NativeScript Public

Commit f15f86a

Browse files
Tsvetan Raikov
committed
Added missing property getters in iOS View class
1 parent a30e3e2 commit f15f86a

1 file changed

Lines changed: 71 additions & 26 deletions

File tree

‎tns-core-modules/ui/core/view.ios.ts‎

Lines changed: 71 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ export class View extends viewCommon.View {
242242
return {
243243
x: utils.layout.toDeviceIndependentPixels(pointInWindow.x),
244244
y: utils.layout.toDeviceIndependentPixels(pointInWindow.y),
245-
}
245+
};
246246
}
247247

248248
public getLocationOnScreen(): viewDefinition.Point {
@@ -255,7 +255,7 @@ export class View extends viewCommon.View {
255255
return {
256256
x: utils.layout.toDeviceIndependentPixels(pointOnScreen.x),
257257
y: utils.layout.toDeviceIndependentPixels(pointOnScreen.y),
258-
}
258+
};
259259
}
260260

261261
public getLocationRelativeTo(otherView: viewDefinition.View): viewDefinition.Point {
@@ -270,19 +270,19 @@ export class View extends viewCommon.View {
270270
return {
271271
x: utils.layout.toDeviceIndependentPixels(myPointInWindow.x - otherPointInWindow.x),
272272
y: utils.layout.toDeviceIndependentPixels(myPointInWindow.y - otherPointInWindow.y),
273-
}
273+
};
274274
}
275275

276276
private _onSizeChanged() {
277277
this.style._sizeChanged();
278278
}
279279

280280
public _updateNativeTransform() {
281-
let translateX = this.style._getValueSource(style.translateXProperty) !== dependencyObservable.ValueSource.Default ? 0 : this.translateX;
282-
let translateY = this.style._getValueSource(style.translateYProperty) !== dependencyObservable.ValueSource.Default ? 0 : this.translateY;
283-
let scaleX = this.style._getValueSource(style.scaleXProperty) !== dependencyObservable.ValueSource.Default ? 1 : this.scaleX;
284-
let scaleY = this.style._getValueSource(style.scaleYProperty) !== dependencyObservable.ValueSource.Default ? 1 : this.scaleY;
285-
let rotate = this.style._getValueSource(style.rotateProperty) !== dependencyObservable.ValueSource.Default ? 0 : this.rotate;
281+
let translateX = this.translateX || 0;
282+
let translateY = this.translateY || 0;
283+
let scaleX = this.scaleX || 1;
284+
let scaleY = this.scaleY || 1;
285+
let rotate = this.rotate || 0;
286286
let newTransform = CGAffineTransformIdentity;
287287
newTransform = CGAffineTransformTranslate(newTransform, translateX, translateY);
288288
newTransform = CGAffineTransformRotate(newTransform, rotate * Math.PI / 180);
@@ -372,7 +372,7 @@ export class CustomLayoutView extends View {
372372
}
373373

374374
export class ViewStyler implements style.Styler {
375-
//Background methods
375+
// Background methods
376376
private static setBackgroundInternalProperty(view: View, newValue: any) {
377377
var nativeView: UIView = <UIView>view._nativeView;
378378
if (nativeView) {
@@ -403,7 +403,7 @@ export class ViewStyler implements style.Styler {
403403
return undefined;
404404
}
405405

406-
//Visibility methods
406+
// Visibility methods
407407
private static setVisibilityProperty(view: View, newValue: any) {
408408
var nativeView: UIView = <UIView>view._nativeView;
409409
if (nativeView) {
@@ -418,7 +418,7 @@ export class ViewStyler implements style.Styler {
418418
}
419419
}
420420

421-
//Opacity methods
421+
// Opacity methods
422422
private static setOpacityProperty(view: View, newValue: any) {
423423
var nativeView: UIView = <UIView>view._nativeView;
424424
if (nativeView) {
@@ -441,7 +441,7 @@ export class ViewStyler implements style.Styler {
441441
}
442442
}
443443

444-
//Border width methods
444+
// Border width methods
445445
private static setBorderWidthProperty(view: View, newValue: any) {
446446
if (view._nativeView instanceof UIView) {
447447
(<UIView>view._nativeView).layer.borderWidth = newValue;
@@ -461,7 +461,7 @@ export class ViewStyler implements style.Styler {
461461
return 0;
462462
}
463463

464-
//Border color methods
464+
// Border color methods
465465
private static setBorderColorProperty(view: View, newValue: any) {
466466
if (view._nativeView instanceof UIView && newValue instanceof UIColor) {
467467
(<UIView>view._nativeView).layer.borderColor = (<UIColor>newValue).CGColor;
@@ -481,7 +481,7 @@ export class ViewStyler implements style.Styler {
481481
return undefined;
482482
}
483483

484-
//Border radius methods
484+
// Border radius methods
485485
private static setBorderRadiusProperty(view: View, newValue: any) {
486486
if (view._nativeView instanceof UIView) {
487487
(<UIView>view._nativeView).layer.cornerRadius = newValue;
@@ -511,7 +511,15 @@ export class ViewStyler implements style.Styler {
511511
view._updateNativeTransform();
512512
}
513513

514-
//ScaleX
514+
private static getRotateProperty(view: View): any {
515+
if (view._nativeView instanceof UIView) {
516+
let t: CGAffineTransform (<UIView>view._nativeView).transform;
517+
return Math.atan2(t.b, t.a);
518+
}
519+
return 0;
520+
}
521+
522+
// ScaleX
515523
private static setScaleXProperty(view: View, newValue: any) {
516524
view._updateNativeTransform();
517525
}
@@ -520,7 +528,15 @@ export class ViewStyler implements style.Styler {
520528
view._updateNativeTransform();
521529
}
522530

523-
//ScaleY
531+
private static getScaleXProperty(view: View): any {
532+
if (view._nativeView instanceof UIView) {
533+
let t: CGAffineTransform (<UIView>view._nativeView).transform;
534+
return Math.sqrt(t.a * t.a + t.c * t.c);
535+
}
536+
return 0;
537+
}
538+
539+
// ScaleY
524540
private static setScaleYProperty(view: View, newValue: any) {
525541
view._updateNativeTransform();
526542
}
@@ -529,7 +545,15 @@ export class ViewStyler implements style.Styler {
529545
view._updateNativeTransform();
530546
}
531547

532-
//TranslateX
548+
private static getScaleYProperty(view: View): any {
549+
if (view._nativeView instanceof UIView) {
550+
let t: CGAffineTransform (<UIView>view._nativeView).transform;
551+
return Math.sqrt(t.b * t.b + t.d * t.d);
552+
}
553+
return 0;
554+
}
555+
556+
// TranslateX
533557
private static setTranslateXProperty(view: View, newValue: any) {
534558
view._updateNativeTransform();
535559
}
@@ -538,7 +562,15 @@ export class ViewStyler implements style.Styler {
538562
view._updateNativeTransform();
539563
}
540564

541-
//TranslateY
565+
private static getTranslateXProperty(view: View): any {
566+
if (view._nativeView instanceof UIView) {
567+
let t: CGAffineTransform (<UIView>view._nativeView).transform;
568+
return t.tx;
569+
}
570+
return 0;
571+
}
572+
573+
// TranslateY
542574
private static setTranslateYProperty(view: View, newValue: any) {
543575
view._updateNativeTransform();
544576
}
@@ -547,7 +579,15 @@ export class ViewStyler implements style.Styler {
547579
view._updateNativeTransform();
548580
}
549581

550-
//z-index
582+
private static getTranslateYProperty(view: View): any {
583+
if (view._nativeView instanceof UIView) {
584+
let t: CGAffineTransform (<UIView>view._nativeView).transform;
585+
return t.ty;
586+
}
587+
return 0;
588+
}
589+
590+
// z-index
551591
private static setZIndexProperty(view: View, newValue: any) {
552592
view.ios.layer.zPosition = newValue;
553593
}
@@ -559,8 +599,8 @@ export class ViewStyler implements style.Styler {
559599
private static getZIndexProperty(view: View): any {
560600
return view.ios.layer.zPosition;
561601
}
562-
563-
//Clip-path methods
602+
603+
// Clip-path methods
564604
private static setClipPathProperty(view: View, newValue: any) {
565605
var nativeView: UIView = <UIView>view._nativeView;
566606
if (nativeView) {
@@ -619,23 +659,28 @@ export class ViewStyler implements style.Styler {
619659

620660
style.registerHandler(style.rotateProperty, new style.StylePropertyChangedHandler(
621661
ViewStyler.setRotateProperty,
622-
ViewStyler.resetRotateProperty));
662+
ViewStyler.resetRotateProperty,
663+
ViewStyler.getRotateProperty));
623664

624665
style.registerHandler(style.scaleXProperty, new style.StylePropertyChangedHandler(
625666
ViewStyler.setScaleXProperty,
626-
ViewStyler.resetScaleXProperty));
667+
ViewStyler.resetScaleXProperty,
668+
ViewStyler.getScaleXProperty));
627669

628670
style.registerHandler(style.scaleYProperty, new style.StylePropertyChangedHandler(
629671
ViewStyler.setScaleYProperty,
630-
ViewStyler.resetScaleYProperty));
672+
ViewStyler.resetScaleYProperty,
673+
ViewStyler.getScaleYProperty));
631674

632675
style.registerHandler(style.translateXProperty, new style.StylePropertyChangedHandler(
633676
ViewStyler.setTranslateXProperty,
634-
ViewStyler.resetTranslateXProperty));
677+
ViewStyler.resetTranslateXProperty,
678+
ViewStyler.getTranslateXProperty));
635679

636680
style.registerHandler(style.translateYProperty, new style.StylePropertyChangedHandler(
637681
ViewStyler.setTranslateYProperty,
638-
ViewStyler.resetTranslateYProperty));
682+
ViewStyler.resetTranslateYProperty,
683+
ViewStyler.getTranslateYProperty));
639684

640685
style.registerHandler(style.zIndexProperty, new style.StylePropertyChangedHandler(
641686
ViewStyler.setZIndexProperty,

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL