3-group-ios/GBA001
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removes UIPreviewInteraction usage in SaveStatesViewController

Browse Source
This commit is contained in:
Riley Testut 2016-08-10 23:44:26 -05:00
parent e2f229fc36
commit d0ada56b92
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Delta/Emulation/GameViewController.swift
View File

@ -188,6 +188,13 @@ extension GameViewController
self.updateControllers() self.updateControllers()
} }
override func viewDidDisappear(_ animated: Bool)
{
super.viewDidDisappear(animated)
self.emulatorCore?.pause()
}
// MARK: - Segues // MARK: - Segues
/// KVO /// KVO

15
Delta/Pause Menu/Save States/SaveStatesViewController.swift
View File

@ -66,7 +66,6 @@ class SaveStatesViewController: UICollectionViewController
private let dateFormatter: DateFormatter private let dateFormatter: DateFormatter
private let previewGameViewController = GameViewController() private let previewGameViewController = GameViewController()
private var previewInteraction: UIPreviewInteraction!
required init?(coder aDecoder: NSCoder) required init?(coder aDecoder: NSCoder)
{ {
@ -127,9 +126,6 @@ extension SaveStatesViewController
// Pre-initialize previewGameViewController with game and start/pause emulation to ensure previewingContext(_:viewControllerForLocation:) callback doesn't take too long + break 3D Touch animation // Pre-initialize previewGameViewController with game and start/pause emulation to ensure previewingContext(_:viewControllerForLocation:) callback doesn't take too long + break 3D Touch animation
self.preparePreviewGameViewController() self.preparePreviewGameViewController()
self.previewInteraction = UIPreviewInteraction(view: self.collectionView!)
self.previewInteraction.delegate = self
self.registerForPreviewing(with: self, sourceView: self.collectionView!) self.registerForPreviewing(with: self, sourceView: self.collectionView!)
self.updateBackgroundView() self.updateBackgroundView()
@ -558,7 +554,7 @@ private extension SaveStatesViewController
} }
//MARK: - 3D Touch - //MARK: - 3D Touch -
extension SaveStatesViewController: UIViewControllerPreviewingDelegate, UIPreviewInteractionDelegate extension SaveStatesViewController: UIViewControllerPreviewingDelegate
{ {
private func preparePreviewGameViewController() private func preparePreviewGameViewController()
{ {
@ -635,15 +631,6 @@ extension SaveStatesViewController: UIViewControllerPreviewingDelegate, UIPrevie
self.loadSaveState(saveState) self.loadSaveState(saveState)
} }
} }
func previewInteraction(_ previewInteraction: UIPreviewInteraction, didUpdatePreviewTransition transitionProgress: CGFloat, ended: Bool)
{
}
func previewInteractionDidCancel(_ previewInteraction: UIPreviewInteraction)
{
self.previewGameViewController.emulatorCore?.pause()
}
} }
//MARK: - <UICollectionViewDataSource> - //MARK: - <UICollectionViewDataSource> -