Commit d31c58e9 by Daniel Dahan

fixed merge conflicts round 2

parent 515fc806
...@@ -272,6 +272,7 @@ public extension MotionContext { ...@@ -272,6 +272,7 @@ public extension MotionContext {
} else { } else {
snapshot = view.snapshotView() ?? UIView() snapshot = view.snapshotView() ?? UIView()
} }
#endif #endif
} }
...@@ -279,6 +280,7 @@ public extension MotionContext { ...@@ -279,6 +280,7 @@ public extension MotionContext {
if let imageView = view as? UIImageView, imageView.adjustsImageWhenAncestorFocused { if let imageView = view as? UIImageView, imageView.adjustsImageWhenAncestorFocused {
snapshot.frame = imageView.focusedFrameGuide.layoutFrame snapshot.frame = imageView.focusedFrameGuide.layoutFrame
} }
#endif #endif
view.layer.cornerRadius = oldCornerRadius view.layer.cornerRadius = oldCornerRadius
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment