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

pivot renamed to origin

Browse Source
This commit is contained in:
vakrilov
2015-11-25 10:26:48 +02:00
parent 6500170699
commit 10ac928088
6 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/transforms/main-page.xml
View File

@@ -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>

28
apps/transforms/model.ts
View File

@@ -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;

28
ui/core/view-common.ts
View File

@@ -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 {

8
ui/core/view.android.ts
View File

@@ -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;

8
ui/core/view.d.ts vendored
View File

@@ -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.

8
ui/core/view.ios.ts
View File

@@ -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;