diff --git a/apps/transforms/main-page.xml b/apps/transforms/main-page.xml index 20db439cd..46aed804d 100644 --- a/apps/transforms/main-page.xml +++ b/apps/transforms/main-page.xml @@ -9,8 +9,8 @@ - - + + @@ -25,10 +25,10 @@ - - + + - + @@ -49,7 +49,7 @@ - + diff --git a/apps/transforms/model.ts b/apps/transforms/model.ts index cc2e1132d..c97b2b292 100644 --- a/apps/transforms/model.ts +++ b/apps/transforms/model.ts @@ -42,22 +42,22 @@ export class ViewModel extends observable.Observable { this.notify({ object: this, eventName: observable.Observable.propertyChangeEvent, propertyName: "scaleY", value: value }); } - private _pivotX = 50; - get pivotX(): number { - return this._pivotX; + private _originX = 50; + get originX(): number { + return this._originX; } - set pivotX(value: number) { - this._pivotX = value; - this.notify({ object: this, eventName: observable.Observable.propertyChangeEvent, propertyName: "pivotX", value: value }); + set originX(value: number) { + this._originX = value; + this.notify({ object: this, eventName: observable.Observable.propertyChangeEvent, propertyName: "originX", value: value }); } - private _pivotY = 50; - get pivotY(): number { - return this._pivotY; + private _originY = 50; + get originY(): number { + return this._originY; } - set pivotY(value: number) { - this._pivotY = value; - this.notify({ object: this, eventName: observable.Observable.propertyChangeEvent, propertyName: "pivotY", value: value }); + set originY(value: number) { + this._originY = value; + this.notify({ object: this, eventName: observable.Observable.propertyChangeEvent, propertyName: "originY", value: value }); } private _rotate = 0; @@ -70,8 +70,8 @@ export class ViewModel extends observable.Observable { } public reset() { - this.pivotX = 50; - this.pivotY = 50; + this.originX = 50; + this.originY = 50; this.scaleX = 100; this.scaleY = 100; this.translateX = 0; diff --git a/ui/core/view-common.ts b/ui/core/view-common.ts index c2b87bd8d..b43eb7c4f 100644 --- a/ui/core/view-common.ts +++ b/ui/core/view-common.ts @@ -149,14 +149,14 @@ var scaleYProperty = new dependencyObservable.Property( new proxy.PropertyMetadata(1) ); -var pivotXProperty = new dependencyObservable.Property( - "pivotX", +var originXProperty = new dependencyObservable.Property( + "originX", "View", new proxy.PropertyMetadata(0.5) ); -var pivotYProperty = new dependencyObservable.Property( - "pivotY", +var originYProperty = new dependencyObservable.Property( + "originY", "View", new proxy.PropertyMetadata(0.5) ); @@ -190,8 +190,8 @@ export class View extends proxy.ProxyObject implements definition.View { public static translateYProperty = translateYProperty; public static scaleXProperty = scaleXProperty; public static scaleYProperty = scaleYProperty; - public static pivotXProperty = pivotXProperty; - public static pivotYProperty = pivotYProperty; + public static originXProperty = originXProperty; + public static originYProperty = originYProperty; public static rotateProperty = rotateProperty; public static isEnabledProperty = isEnabledProperty; public static isUserInteractionEnabledProperty = isUserInteractionEnabledProperty; @@ -484,18 +484,18 @@ export class View extends proxy.ProxyObject implements definition.View { this._setValue(View.scaleYProperty, value); } - get pivotX(): number { - return this._getValue(View.pivotXProperty); + get originX(): number { + return this._getValue(View.originXProperty); } - set pivotX(value: number) { - this._setValue(View.pivotXProperty, value); + set originX(value: number) { + this._setValue(View.originXProperty, value); } - get pivotY(): number { - return this._getValue(View.pivotYProperty); + get originY(): number { + return this._getValue(View.originYProperty); } - set pivotY(value: number) { - this._setValue(View.pivotYProperty, value); + set originY(value: number) { + this._setValue(View.originYProperty, value); } get rotate(): number { diff --git a/ui/core/view.android.ts b/ui/core/view.android.ts index 65b3a1fd0..9a8e91f90 100644 --- a/ui/core/view.android.ts +++ b/ui/core/view.android.ts @@ -44,19 +44,19 @@ function onScaleYPropertyChanged(data: dependencyObservable.PropertyChangeData) } (viewCommon.View.scaleYProperty.metadata).onSetNativeValue = onScaleYPropertyChanged; -function onPivotXPropertyChanged(data: dependencyObservable.PropertyChangeData) { +function onOriginXPropertyChanged(data: dependencyObservable.PropertyChangeData) { var view = data.object; var width = view._nativeView.getWidth(); view._nativeView.setPivotX(data.newValue * width); } -(viewCommon.View.pivotXProperty.metadata).onSetNativeValue = onPivotXPropertyChanged; +(viewCommon.View.originXProperty.metadata).onSetNativeValue = onOriginXPropertyChanged; -function onPivotYPropertyChanged(data: dependencyObservable.PropertyChangeData) { +function onOriginYPropertyChanged(data: dependencyObservable.PropertyChangeData) { var view = data.object; var height = view._nativeView.getHeight(); view._nativeView.setPivotY(data.newValue * height); } -(viewCommon.View.pivotYProperty.metadata).onSetNativeValue = onPivotYPropertyChanged; +(viewCommon.View.originYProperty.metadata).onSetNativeValue = onOriginYPropertyChanged; function onRotatePropertyChanged(data: dependencyObservable.PropertyChangeData) { var view = data.object; diff --git a/ui/core/view.d.ts b/ui/core/view.d.ts index 9261fa2b9..ede1427e8 100644 --- a/ui/core/view.d.ts +++ b/ui/core/view.d.ts @@ -260,14 +260,14 @@ declare module "ui/core/view" { scaleY: number; /** - * Gets or sets the X component of the pivot point around which the view will be transformed. The deafault value is 0.5 representing the center of the view. + * Gets or sets the X component of the origin point around which the view will be transformed. The deafault value is 0.5 representing the center of the view. */ - pivotX: number; + originX: number; /** - * Gets or sets the Y component of the pivot point around which the view will be transformed. The deafault value is 0.5 representing the center of the view. + * Gets or sets the Y component of the origin point around which the view will be transformed. The deafault value is 0.5 representing the center of the view. */ - pivotY: number; + originY: number; /** * Gets or sets the rotate affine transform of the view. diff --git a/ui/core/view.ios.ts b/ui/core/view.ios.ts index db586e7b7..1186fcb48 100644 --- a/ui/core/view.ios.ts +++ b/ui/core/view.ios.ts @@ -66,19 +66,19 @@ function onScaleYPropertyChanged(data: dependencyObservable.PropertyChangeData) } (viewCommon.View.scaleYProperty.metadata).onSetNativeValue = onScaleYPropertyChanged; -function onPivotXPropertyChanged(data: dependencyObservable.PropertyChangeData) { +function onOriginXPropertyChanged(data: dependencyObservable.PropertyChangeData) { var view = data.object; var current = view._nativeView.layer.anchorPoint; view._nativeView.layer.anchorPoint = CGPointMake(data.newValue, current.y); } -(viewCommon.View.pivotXProperty.metadata).onSetNativeValue = onPivotXPropertyChanged; +(viewCommon.View.originXProperty.metadata).onSetNativeValue = onOriginXPropertyChanged; -function onPivotYPropertyChanged(data: dependencyObservable.PropertyChangeData) { +function onOriginYPropertyChanged(data: dependencyObservable.PropertyChangeData) { var view = data.object; var current = view._nativeView.layer.anchorPoint; view._nativeView.layer.anchorPoint = CGPointMake(current.x, data.newValue); } -(viewCommon.View.pivotYProperty.metadata).onSetNativeValue = onPivotYPropertyChanged; +(viewCommon.View.originYProperty.metadata).onSetNativeValue = onOriginYPropertyChanged; function onRotatePropertyChanged(data: dependencyObservable.PropertyChangeData) { var view = data.object;