diff options
| author | Vlad Mihaylenko <vxmihaylenko@gmail.com> | 2017-01-19 13:50:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-19 13:50:08 +0300 |
| commit | 2098dcc50486eb9e88fa5ece3ab281f07db63f5c (patch) | |
| tree | ee335643ac7a3b26231ce5e9ebd49a3da8d3498c | |
| parent | cd0d0fdc7a56bf6b0625a7ca3d4645fd6b17f8a1 (diff) | |
| parent | 9a6089af9b11b5d040eb9f71f6be1bd4700c9212 (diff) | |
Merge pull request #5232 from igrechuhin/welcome
[welcome] [ios] Fixed welcome controller crash.
| -rw-r--r-- | iphone/Maps/UI/Welcome/WelcomePageController.swift | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/iphone/Maps/UI/Welcome/WelcomePageController.swift b/iphone/Maps/UI/Welcome/WelcomePageController.swift index dc8d63fcdf..a60d868c49 100644 --- a/iphone/Maps/UI/Welcome/WelcomePageController.swift +++ b/iphone/Maps/UI/Welcome/WelcomePageController.swift @@ -21,10 +21,13 @@ final class WelcomePageController: UIPageViewController { return viewControllers?.first } set { - guard let controller = newValue else { return } + guard let controller = newValue, let parentView = parentController.view else { return } let animated = !isAnimatingTransition + parentView.isUserInteractionEnabled = isAnimatingTransition setViewControllers([controller], direction: .forward, animated: animated) { [weak self] _ in - self?.isAnimatingTransition = false + guard let s = self else { return } + s.isAnimatingTransition = false + parentView.isUserInteractionEnabled = true } isAnimatingTransition = animated } @@ -46,9 +49,9 @@ final class WelcomePageController: UIPageViewController { override func viewDidLoad() { super.viewDidLoad() - let parentView = parentController.view! view.backgroundColor = UIColor.white() if IPAD() { + let parentView = parentController.view! iPadBackgroundView = SolidTouchView(frame: parentView.bounds) iPadBackgroundView!.backgroundColor = UIColor.fadeBackground() iPadBackgroundView!.autoresizingMask = [.flexibleWidth, .flexibleHeight] |