From 3921dbc9ffc9da9de7a6e9b6f07a5b32b76bef81 Mon Sep 17 00:00:00 2001 From: Yingtao Guo Date: Fri, 4 Nov 2022 01:22:11 -0400 Subject: [PATCH] fix: present full screen for mac catalyst (#226) fix some demos --- Example/ViewController.swift | 4 +--- Sources/Mantis/CropViewController/CropViewController.swift | 6 +++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Example/ViewController.swift b/Example/ViewController.swift index e0f33a3a..0353c2f4 100644 --- a/Example/ViewController.swift +++ b/Example/ViewController.swift @@ -81,7 +81,7 @@ class ViewController: UIViewController, CropViewControllerDelegate { var config = Mantis.Config() config.showAttachedCropToolbar = false - config.cropViewConfig.showRotationDial = true + config.cropViewConfig.showRotationDial = false config.cropViewConfig.minimumZoomScale = 2.0 config.cropViewConfig.maximumZoomScale = 10.0 @@ -90,7 +90,6 @@ class ViewController: UIViewController, CropViewControllerDelegate { cropViewController.delegate = self cropViewController.title = "Change Profile Picture" let navigationController = UINavigationController(rootViewController: cropViewController) - navigationController.modalPresentationStyle = .fullScreen cropToolbar.cropViewController = cropViewController @@ -105,7 +104,6 @@ class ViewController: UIViewController, CropViewControllerDelegate { let config = Mantis.Config() let cropViewController = Mantis.cropViewController(image: image, config: config) - cropViewController.modalPresentationStyle = .fullScreen cropViewController.delegate = self cropViewController.config.presetFixedRatioType = .alwaysUsingOnePresetFixedRatio(ratio: 16.0 / 9.0) present(cropViewController, animated: true) diff --git a/Sources/Mantis/CropViewController/CropViewController.swift b/Sources/Mantis/CropViewController/CropViewController.swift index 9e608bb9..134b3af0 100644 --- a/Sources/Mantis/CropViewController/CropViewController.swift +++ b/Sources/Mantis/CropViewController/CropViewController.swift @@ -171,7 +171,11 @@ public class CropViewController: UIViewController { override public func viewDidLoad() { super.viewDidLoad() - + +#if targetEnvironment(macCatalyst) + modalPresentationStyle = .fullScreen + navigationController?.modalPresentationStyle = .fullScreen +#endif view.backgroundColor = .black createCropView()