| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
1 parent 32fa226 commit db92533
1 file changed
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -158,6 +158,7 @@ export class View extends ViewCommon implements ViewDefinition { | |||
| 158 | 158 | } | |
| 159 | 159 | ||
| 160 | 160 | public _setNativeViewFrame(nativeView: UIView, frame: CGRect): void { | |
| 161 | + | ||
| 161 | 162 | let oldFrame = this._cachedFrame || nativeView.frame; | |
| 162 | 163 | if (!CGRectEqualToRect(oldFrame, frame)) { | |
| 163 | 164 | if (traceEnabled()) { | |
@@ -168,8 +169,8 @@ export class View extends ViewCommon implements ViewDefinition { | |||
| 168 | 169 | let transform = null; | |
| 169 | 170 | if (this._hasTransfrom) { | |
| 170 | 171 | // 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; | ||
| 173 | 174 | nativeView.frame = frame; | |
| 174 | 175 | } else { | |
| 175 | 176 | nativeView.frame = frame; | |
@@ -180,9 +181,10 @@ export class View extends ViewCommon implements ViewDefinition { | |||
| 180 | 181 | nativeView.frame = adjustedFrame; | |
| 181 | 182 | } | |
| 182 | 183 | ||
| 184 | + | ||
| 183 | 185 | if (this._hasTransfrom) { | |
| 184 | 186 | // re-apply the transform after the frame is adjusted | |
| 185 | - nativeView.transform = transform; | ||
| 187 | + nativeView.layer.transform = transform; | ||
| 186 | 188 | } | |
| 187 | 189 | ||
| 188 | 190 | const boundsOrigin = nativeView.bounds.origin; | |
@@ -362,14 +364,13 @@ export class View extends ViewCommon implements ViewDefinition { | |||
| 362 | 364 | transform = CATransform3DTranslate(transform, this.translateX, this.translateY, 0); | |
| 363 | 365 | transform = iosNativeHelper.applyRotateTransform(transform, this.rotateX, this.rotateY, this.rotate); | |
| 364 | 366 | 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)) { | ||
| 367 | 368 | const updateSuspended = this._isPresentationLayerUpdateSuspeneded(); | |
| 368 | 369 | if (!updateSuspended) { | |
| 369 | 370 | CATransaction.begin(); | |
| 370 | 371 | } | |
| 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); | ||
| 373 | 374 | if (!updateSuspended) { | |
| 374 | 375 | CATransaction.commit(); | |
| 375 | 376 | } | |
| Back | FazBrowse Home | New Git URL |
0 commit comments