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

fix: view.__hasTransfrom not set updating properly · NativeScript/NativeScript@db92533 · GitHub

Repository navigation

Commit db92533

Browse files
vakrilov
committed
fix: view.__hasTransfrom not set updating properly
1 parent 32fa226 commit db92533

1 file changed

Lines changed: 8 additions & 7 deletions

File tree

‎nativescript-core/ui/core/view/view.ios.ts‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ export class View extends ViewCommon implements ViewDefinition {
158158
}
159159

160160
public _setNativeViewFrame(nativeView: UIView, frame: CGRect): void {
161+
161162
let oldFrame = this._cachedFrame || nativeView.frame;
162163
if (!CGRectEqualToRect(oldFrame, frame)) {
163164
if (traceEnabled()) {
@@ -168,8 +169,8 @@ export class View extends ViewCommon implements ViewDefinition {
168169
let transform = null;
169170
if (this._hasTransfrom) {
170171
// Always set identity transform before setting frame;
171-
transform = nativeView.transform;
172-
nativeView.transform = CGAffineTransformIdentity;
172+
transform = nativeView.layer.transform;
173+
nativeView.layer.transform = CATransform3DIdentity;
173174
nativeView.frame = frame;
174175
} else {
175176
nativeView.frame = frame;
@@ -180,9 +181,10 @@ export class View extends ViewCommon implements ViewDefinition {
180181
nativeView.frame = adjustedFrame;
181182
}
182183

184+
183185
if (this._hasTransfrom) {
184186
// re-apply the transform after the frame is adjusted
185-
nativeView.transform = transform;
187+
nativeView.layer.transform = transform;
186188
}
187189

188190
const boundsOrigin = nativeView.bounds.origin;
@@ -362,14 +364,13 @@ export class View extends ViewCommon implements ViewDefinition {
362364
transform = CATransform3DTranslate(transform, this.translateX, this.translateY, 0);
363365
transform = iosNativeHelper.applyRotateTransform(transform, this.rotateX, this.rotateY, this.rotate);
364366
transform = CATransform3DScale(transform, scaleX, scaleY, 1);
365-
this.ios.layer.transform = transform;
366-
if (!CATransform3DEqualToTransform(this.ios.layer.transform, transform)) {
367+
if (!CATransform3DEqualToTransform(this.nativeViewProtected.layer.transform, transform)) {
367368
const updateSuspended = this._isPresentationLayerUpdateSuspeneded();
368369
if (!updateSuspended) {
369370
CATransaction.begin();
370371
}
371-
this.ios.layer.transform = transform;
372-
this._hasTransfrom = this.nativeViewProtected && !CATransform3DEqualToTransform(this.nativeViewProtected.layer.transform, CATransform3DIdentity);
372+
this.nativeViewProtected.layer.transform = transform;
373+
this._hasTransfrom = this.nativeViewProtected && !CATransform3DEqualToTransform(this.nativeViewProtected.transform3D, CATransform3DIdentity);
373374
if (!updateSuspended) {
374375
CATransaction.commit();
375376
}

0 commit comments

Comments
 (0)

Back | FazBrowse Home | New Git URL