From 5a63071242ac633fd18dc0dbdcb79d3bdd1859f2 Mon Sep 17 00:00:00 2001
From: vakrilov <alexander.vakrilov@telerik.com>
Date: Tue, 24 Nov 2015 11:23:43 +0200
Subject: [PATCH 1/3] Updated transforms app

---
 CrossPlatformModules.csproj   |  2 +-
 apps/transforms/main-page.ts  |  5 +++
 apps/transforms/main-page.xml | 59 +++++++++++++++++++++++++----------
 apps/transforms/model.ts      | 33 ++++++++++++++++++--
 4 files changed, 80 insertions(+), 19 deletions(-)

diff --git a/CrossPlatformModules.csproj b/CrossPlatformModules.csproj
index bb95f4f6c..62f5dea41 100644
--- a/CrossPlatformModules.csproj
+++ b/CrossPlatformModules.csproj
@@ -2104,7 +2104,7 @@
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
-      <UserProperties ui_2scroll-view_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2editable-text-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2absolute-layout-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2gallery-app_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2content-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2web-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2absolute-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2dock-layout_2package_1json__JSONSchema="" ui_2layouts_2grid-layout_2package_1json__JSONSchema="" ui_2layouts_2wrap-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" />
+      <UserProperties ui_2layouts_2wrap-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2layouts_2grid-layout_2package_1json__JSONSchema="" ui_2layouts_2dock-layout_2package_1json__JSONSchema="" ui_2layouts_2absolute-layout_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2web-view_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2content-view_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2gallery-app_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2absolute-layout-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" apps_2editable-text-demo_2package_1json__JSONSchema="http://json.schemastore.org/package" ui_2scroll-view_2package_1json__JSONSchema="http://json.schemastore.org/package" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/apps/transforms/main-page.ts b/apps/transforms/main-page.ts
index 94782be09..7dee8e379 100644
--- a/apps/transforms/main-page.ts
+++ b/apps/transforms/main-page.ts
@@ -5,4 +5,9 @@ import model = require("./model");
 export function pageLoaded(args: observable.EventData) {
     var page = <pages.Page>args.object;
     page.bindingContext = new model.ViewModel();
+}
+
+export function onReset(args: observable.EventData) {
+    var model = <model.ViewModel>(<any>args.object).bindingContext;
+    model.reset();
 }
\ No newline at end of file
diff --git a/apps/transforms/main-page.xml b/apps/transforms/main-page.xml
index 7940cb54a..20db439cd 100644
--- a/apps/transforms/main-page.xml
+++ b/apps/transforms/main-page.xml
@@ -1,29 +1,56 @@
-<Page xmlns="http://schemas.nativescript.org/tns.xsd" loaded="pageLoaded" id="mainPage">
-  <StackLayout orientation="vertical" backgroundColor="LightGray" paddingLeft="5" paddingRight="5">
+<Page loaded="pageLoaded" id="mainPage">
+  <GridLayout columns="*, *" rows="auto, *">
 
-    <Label text="translateX" marginTop="5" />
-    <Slider minValue="-300" maxValue="300" value="{{ translateX }}"/>
+    <StackLayout orientation="vertical" backgroundColor="LightGray" paddingLeft="5" paddingRight="5">
 
-    <Label text="translateY" marginTop="5" />
-    <Slider minValue="-300" maxValue="300" value="{{ translateY }}"/>
+      <Label text="{{ 'translateX (' + translateX + ')' }}" marginTop="5" />
+      <Slider minValue="-300" maxValue="300" value="{{ translateX }}"/>
 
-    <Label text="scaleX" marginTop="5" />
-    <Slider minValue="0" maxValue="5" value="{{ scaleX }}"/>
+      <Label text="{{ 'scaleX (' + (scaleX / 100) + ')' }}" marginTop="5" />
+      <Slider minValue="0" maxValue="300" value="{{ scaleX }}"/>
 
-    <Label text="scaleY" marginTop="5" />
-    <Slider minValue="0" maxValue="5" value="{{ scaleY }}"/>
+      <Label text="{{ 'pivotX (' + (pivotX / 100) + ')' }}" marginTop="5" />
+      <Slider minValue="-100" maxValue="200" value="{{ pivotX }}"/>
 
-    <Label text="rotate" marginTop="5" />
-    <Slider minValue="-360" maxValue="360" value="{{ rotate }}"/>
+      <Label text="{{ 'rotate (' + rotate + ')' }}" marginTop="5" />
+      <Slider minValue="-360" maxValue="360" value="{{ rotate }}"/>
 
-    <AbsoluteLayout backgroundColor="Yellow" width="300" height="300" clipToBounds="true" marginTop="5" marginBottom="5">
+    </StackLayout>
+
+    <StackLayout col="1" orientation="vertical" backgroundColor="LightGray" paddingLeft="5" paddingRight="5">
+
+      <Label text="{{ 'translateY (' + translateY + ')' }}" marginTop="5" />
+      <Slider minValue="-300" maxValue="300" value="{{ translateY }}"/>
+
+      <Label text="{{ 'scaleY (' + (scaleY / 100) + ')' }}" marginTop="5" />
+      <Slider minValue="0" maxValue="300" value="{{ scaleY }}"/>
+
+      <Label text="{{ 'pivotY (' + (pivotY / 100) + ')' }}" marginTop="5" />
+      <Slider minValue="-100" maxValue="200" value="{{ pivotY }}"/>
+
+      <Button text="Reset" margin="5" tap="onReset">
+    </StackLayout>
+
+    <AbsoluteLayout row="1" colSpan="2"
+                    backgroundColor="Yellow" width="300" height="300" clipToBounds="true" marginTop="5" marginBottom="5">
       <Label text="Transform Me!" backgroundColor="Green" width="100" height="100" left="100" top="100"
               translateX="{{ translateX }}"
               translateY="{{ translateY }}"
-              scaleX="{{ scaleX }}"
-              scaleY="{{ scaleY }}"
+              scaleX="{{ scaleX / 100 }}"
+              scaleY="{{ scaleY / 100 }}"
+              pivotX="{{ pivotX / 100 }}"
+              pivotY="{{ pivotY / 100 }}"
               rotate="{{ rotate }}"
             />
+
+      <StackLayout width="1" height="300" backgroundColor="gray" left="99" />
+      <StackLayout width="1" height="300" backgroundColor="gray" left="200" />
+
+      <StackLayout height="1" width="300" backgroundColor="gray" top="99" />
+      <StackLayout height="1" width="300" backgroundColor="gray" top="200" />
+
+      <StackLayout height="2" width="2" backgroundColor="red" marginLeft="{{ pivotX + 99 }}" marginTop="{{ pivotY + 99 }}" />
+
     </AbsoluteLayout>
-  </StackLayout>
+  </GridLayout>
 </Page>
\ No newline at end of file
diff --git a/apps/transforms/model.ts b/apps/transforms/model.ts
index a103b8a96..cc2e1132d 100644
--- a/apps/transforms/model.ts
+++ b/apps/transforms/model.ts
@@ -3,6 +3,7 @@
 export class ViewModel extends observable.Observable {
     constructor() {
         super();
+        this.reset();
     }
 
     private _translateX = 0;;
@@ -23,7 +24,7 @@ export class ViewModel extends observable.Observable {
         this.notify({ object: this, eventName: observable.Observable.propertyChangeEvent, propertyName: "translateY", value: value });
     }
 
-    private _scaleX = 1;
+    private _scaleX = 100;
     get scaleX(): number {
         return this._scaleX;
     }
@@ -32,7 +33,7 @@ export class ViewModel extends observable.Observable {
         this.notify({ object: this, eventName: observable.Observable.propertyChangeEvent, propertyName: "scaleX", value: value });
     }
 
-    private _scaleY = 1;
+    private _scaleY = 100;
     get scaleY(): number {
         return this._scaleY;
     }
@@ -41,6 +42,24 @@ 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;
+    }
+    set pivotX(value: number) {
+        this._pivotX = value;
+        this.notify({ object: this, eventName: observable.Observable.propertyChangeEvent, propertyName: "pivotX", value: value });
+    }
+
+    private _pivotY = 50;
+    get pivotY(): number {
+        return this._pivotY;
+    }
+    set pivotY(value: number) {
+        this._pivotY = value;
+        this.notify({ object: this, eventName: observable.Observable.propertyChangeEvent, propertyName: "pivotY", value: value });
+    }
+
     private _rotate = 0;
     get rotate(): number {
         return this._rotate;
@@ -49,4 +68,14 @@ export class ViewModel extends observable.Observable {
         this._rotate = value;
         this.notify({ object: this, eventName: observable.Observable.propertyChangeEvent, propertyName: "rotate", value: value });
     }
+
+    public reset() {
+        this.pivotX = 50;
+        this.pivotY = 50;
+        this.scaleX = 100;
+        this.scaleY = 100;
+        this.translateX = 0;
+        this.translateY = 0;
+        this.rotate = 0;
+    }
 }
\ No newline at end of file

From 6500170699ab70abcd5c3913a694b711f783c04b Mon Sep 17 00:00:00 2001
From: vakrilov <alexander.vakrilov@telerik.com>
Date: Tue, 24 Nov 2015 14:44:00 +0200
Subject: [PATCH 2/3] Pivot point implementation

---
 ui/core/view-common.ts  | 28 ++++++++++++++++++++++++++++
 ui/core/view.android.ts | 14 ++++++++++++++
 ui/core/view.d.ts       | 10 ++++++++++
 ui/core/view.ios.ts     | 14 ++++++++++++++
 4 files changed, 66 insertions(+)

diff --git a/ui/core/view-common.ts b/ui/core/view-common.ts
index c1c85898b..c2b87bd8d 100644
--- a/ui/core/view-common.ts
+++ b/ui/core/view-common.ts
@@ -148,6 +148,18 @@ var scaleYProperty = new dependencyObservable.Property(
     "View",
     new proxy.PropertyMetadata(1)
     );
+    
+var pivotXProperty = new dependencyObservable.Property(
+    "pivotX",
+    "View",
+    new proxy.PropertyMetadata(0.5)
+    );
+
+var pivotYProperty = new dependencyObservable.Property(
+    "pivotY",
+    "View",
+    new proxy.PropertyMetadata(0.5)
+    );
 
 var rotateProperty = new dependencyObservable.Property(
     "rotate",
@@ -178,6 +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 rotateProperty = rotateProperty;
     public static isEnabledProperty = isEnabledProperty;
     public static isUserInteractionEnabledProperty = isUserInteractionEnabledProperty;
@@ -470,6 +484,20 @@ export class View extends proxy.ProxyObject implements definition.View {
         this._setValue(View.scaleYProperty, value);
     }
 
+    get pivotX(): number {
+        return this._getValue(View.pivotXProperty);
+    }
+    set pivotX(value: number) {
+        this._setValue(View.pivotXProperty, value);
+    }
+
+    get pivotY(): number {
+        return this._getValue(View.pivotYProperty);
+    }
+    set pivotY(value: number) {
+        this._setValue(View.pivotYProperty, value);
+    }
+
     get rotate(): number {
         return this._getValue(View.rotateProperty);
     }
diff --git a/ui/core/view.android.ts b/ui/core/view.android.ts
index 6a600229f..65b3a1fd0 100644
--- a/ui/core/view.android.ts
+++ b/ui/core/view.android.ts
@@ -44,6 +44,20 @@ function onScaleYPropertyChanged(data: dependencyObservable.PropertyChangeData)
 }
 (<proxy.PropertyMetadata>viewCommon.View.scaleYProperty.metadata).onSetNativeValue = onScaleYPropertyChanged;
 
+function onPivotXPropertyChanged(data: dependencyObservable.PropertyChangeData) {
+    var view = <View>data.object;
+    var width = view._nativeView.getWidth();
+    view._nativeView.setPivotX(data.newValue * width);
+}
+(<proxy.PropertyMetadata>viewCommon.View.pivotXProperty.metadata).onSetNativeValue = onPivotXPropertyChanged;
+
+function onPivotYPropertyChanged(data: dependencyObservable.PropertyChangeData) {
+    var view = <View>data.object;
+    var height = view._nativeView.getHeight();
+    view._nativeView.setPivotY(data.newValue * height);
+}
+(<proxy.PropertyMetadata>viewCommon.View.pivotYProperty.metadata).onSetNativeValue = onPivotYPropertyChanged;
+
 function onRotatePropertyChanged(data: dependencyObservable.PropertyChangeData) {
     var view = <View>data.object;
     view._nativeView.setRotation(data.newValue);
diff --git a/ui/core/view.d.ts b/ui/core/view.d.ts
index a6fd21c06..9261fa2b9 100644
--- a/ui/core/view.d.ts
+++ b/ui/core/view.d.ts
@@ -259,6 +259,16 @@ 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.
+         */
+        pivotX: 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.
+         */
+        pivotY: 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 1927f8532..db586e7b7 100644
--- a/ui/core/view.ios.ts
+++ b/ui/core/view.ios.ts
@@ -66,6 +66,20 @@ function onScaleYPropertyChanged(data: dependencyObservable.PropertyChangeData)
 }
 (<proxy.PropertyMetadata>viewCommon.View.scaleYProperty.metadata).onSetNativeValue = onScaleYPropertyChanged;
 
+function onPivotXPropertyChanged(data: dependencyObservable.PropertyChangeData) {
+    var view = <View>data.object;
+    var current = view._nativeView.layer.anchorPoint;
+    view._nativeView.layer.anchorPoint = CGPointMake(data.newValue, current.y);
+}
+(<proxy.PropertyMetadata>viewCommon.View.pivotXProperty.metadata).onSetNativeValue = onPivotXPropertyChanged;
+
+function onPivotYPropertyChanged(data: dependencyObservable.PropertyChangeData) {
+    var view = <View>data.object;
+    var current = view._nativeView.layer.anchorPoint;
+    view._nativeView.layer.anchorPoint = CGPointMake(current.x, data.newValue);
+}
+(<proxy.PropertyMetadata>viewCommon.View.pivotYProperty.metadata).onSetNativeValue = onPivotYPropertyChanged;
+
 function onRotatePropertyChanged(data: dependencyObservable.PropertyChangeData) {
     var view = <View>data.object;
     var newTransform = CGAffineTransformIdentity;

From 10ac928088e2481380e3c8c6caf3e39af59e190b Mon Sep 17 00:00:00 2001
From: vakrilov <alexander.vakrilov@telerik.com>
Date: Wed, 25 Nov 2015 10:26:48 +0200
Subject: [PATCH 3/3] `pivot` renamed to `origin`

---
 apps/transforms/main-page.xml | 16 ++++++++--------
 apps/transforms/model.ts      | 28 ++++++++++++++--------------
 ui/core/view-common.ts        | 28 ++++++++++++++--------------
 ui/core/view.android.ts       |  8 ++++----
 ui/core/view.d.ts             |  8 ++++----
 ui/core/view.ios.ts           |  8 ++++----
 6 files changed, 48 insertions(+), 48 deletions(-)

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 @@
       <Label text="{{ 'scaleX (' + (scaleX / 100) + ')' }}" marginTop="5" />
       <Slider minValue="0" maxValue="300" value="{{ scaleX }}"/>
 
-      <Label text="{{ 'pivotX (' + (pivotX / 100) + ')' }}" marginTop="5" />
-      <Slider minValue="-100" maxValue="200" value="{{ pivotX }}"/>
+      <Label text="{{ 'originX (' + (originX / 100) + ')' }}" marginTop="5" />
+      <Slider minValue="-100" maxValue="200" value="{{ originX }}"/>
 
       <Label text="{{ 'rotate (' + rotate + ')' }}" marginTop="5" />
       <Slider minValue="-360" maxValue="360" value="{{ rotate }}"/>
@@ -25,10 +25,10 @@
       <Label text="{{ 'scaleY (' + (scaleY / 100) + ')' }}" marginTop="5" />
       <Slider minValue="0" maxValue="300" value="{{ scaleY }}"/>
 
-      <Label text="{{ 'pivotY (' + (pivotY / 100) + ')' }}" marginTop="5" />
-      <Slider minValue="-100" maxValue="200" value="{{ pivotY }}"/>
+      <Label text="{{ 'originY (' + (originY / 100) + ')' }}" marginTop="5" />
+      <Slider minValue="-100" maxValue="200" value="{{ originY }}"/>
 
-      <Button text="Reset" margin="5" tap="onReset">
+      <Button text="Reset" margin="5" tap="onReset" />
     </StackLayout>
 
     <AbsoluteLayout row="1" colSpan="2"
@@ -38,8 +38,8 @@
               translateY="{{ translateY }}"
               scaleX="{{ scaleX / 100 }}"
               scaleY="{{ scaleY / 100 }}"
-              pivotX="{{ pivotX / 100 }}"
-              pivotY="{{ pivotY / 100 }}"
+              originX="{{ originX / 100 }}"
+              originY="{{ originY / 100 }}"
               rotate="{{ rotate }}"
             />
 
@@ -49,7 +49,7 @@
       <StackLayout height="1" width="300" backgroundColor="gray" top="99" />
       <StackLayout height="1" width="300" backgroundColor="gray" top="200" />
 
-      <StackLayout height="2" width="2" backgroundColor="red" marginLeft="{{ pivotX + 99 }}" marginTop="{{ pivotY + 99 }}" />
+      <StackLayout height="2" width="2" backgroundColor="red" marginLeft="{{ originX + 99 }}" marginTop="{{ originY + 99 }}" />
 
     </AbsoluteLayout>
   </GridLayout>
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)
 }
 (<proxy.PropertyMetadata>viewCommon.View.scaleYProperty.metadata).onSetNativeValue = onScaleYPropertyChanged;
 
-function onPivotXPropertyChanged(data: dependencyObservable.PropertyChangeData) {
+function onOriginXPropertyChanged(data: dependencyObservable.PropertyChangeData) {
     var view = <View>data.object;
     var width = view._nativeView.getWidth();
     view._nativeView.setPivotX(data.newValue * width);
 }
-(<proxy.PropertyMetadata>viewCommon.View.pivotXProperty.metadata).onSetNativeValue = onPivotXPropertyChanged;
+(<proxy.PropertyMetadata>viewCommon.View.originXProperty.metadata).onSetNativeValue = onOriginXPropertyChanged;
 
-function onPivotYPropertyChanged(data: dependencyObservable.PropertyChangeData) {
+function onOriginYPropertyChanged(data: dependencyObservable.PropertyChangeData) {
     var view = <View>data.object;
     var height = view._nativeView.getHeight();
     view._nativeView.setPivotY(data.newValue * height);
 }
-(<proxy.PropertyMetadata>viewCommon.View.pivotYProperty.metadata).onSetNativeValue = onPivotYPropertyChanged;
+(<proxy.PropertyMetadata>viewCommon.View.originYProperty.metadata).onSetNativeValue = onOriginYPropertyChanged;
 
 function onRotatePropertyChanged(data: dependencyObservable.PropertyChangeData) {
     var view = <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)
 }
 (<proxy.PropertyMetadata>viewCommon.View.scaleYProperty.metadata).onSetNativeValue = onScaleYPropertyChanged;
 
-function onPivotXPropertyChanged(data: dependencyObservable.PropertyChangeData) {
+function onOriginXPropertyChanged(data: dependencyObservable.PropertyChangeData) {
     var view = <View>data.object;
     var current = view._nativeView.layer.anchorPoint;
     view._nativeView.layer.anchorPoint = CGPointMake(data.newValue, current.y);
 }
-(<proxy.PropertyMetadata>viewCommon.View.pivotXProperty.metadata).onSetNativeValue = onPivotXPropertyChanged;
+(<proxy.PropertyMetadata>viewCommon.View.originXProperty.metadata).onSetNativeValue = onOriginXPropertyChanged;
 
-function onPivotYPropertyChanged(data: dependencyObservable.PropertyChangeData) {
+function onOriginYPropertyChanged(data: dependencyObservable.PropertyChangeData) {
     var view = <View>data.object;
     var current = view._nativeView.layer.anchorPoint;
     view._nativeView.layer.anchorPoint = CGPointMake(current.x, data.newValue);
 }
-(<proxy.PropertyMetadata>viewCommon.View.pivotYProperty.metadata).onSetNativeValue = onPivotYPropertyChanged;
+(<proxy.PropertyMetadata>viewCommon.View.originYProperty.metadata).onSetNativeValue = onOriginYPropertyChanged;
 
 function onRotatePropertyChanged(data: dependencyObservable.PropertyChangeData) {
     var view = <View>data.object;