mirror of
https://github.com/scummvm/scummvm.git
synced 2025-04-02 10:52:32 -04:00
47d9d2f3a1
Remove an accidental semicolon after a function definition which was ignored by the compiler but generated a warning. Rename a variable inside a code block that was generating a warning about shadowing a local variable.
122 lines
4.1 KiB
Text
122 lines
4.1 KiB
Text
/* ScummVM - Graphic Adventure Engine
|
|
*
|
|
* ScummVM is the legal property of its developers, whose names
|
|
* are too numerous to list here. Please refer to the COPYRIGHT
|
|
* file distributed with this source distribution.
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
*/
|
|
|
|
#include "backends/platform/ios7/ios7_scummvm_view_controller.h"
|
|
#include "backends/platform/ios7/ios7_app_delegate.h"
|
|
#include "backends/platform/ios7/ios7_video.h"
|
|
|
|
@implementation iOS7ScummVMViewController
|
|
|
|
- (id)init {
|
|
self = [super init];
|
|
#if TARGET_OS_IOS
|
|
self->currentOrientation = UIInterfaceOrientationUnknown;
|
|
#endif
|
|
return self;
|
|
}
|
|
|
|
- (BOOL)prefersStatusBarHidden {
|
|
return YES;
|
|
}
|
|
|
|
- (BOOL)prefersHomeIndicatorAutoHidden {
|
|
return YES;
|
|
}
|
|
|
|
- (BOOL)prefersPointerLocked {
|
|
/* This hides the OS cursor so ScummVM has to draw one */
|
|
return YES;
|
|
}
|
|
|
|
#if TARGET_OS_IOS
|
|
|
|
- (UIRectEdge)preferredScreenEdgesDeferringSystemGestures {
|
|
return UIRectEdgeAll;
|
|
}
|
|
|
|
- (UIInterfaceOrientation)interfaceOrientation {
|
|
if (@available(iOS 13.0, *)) {
|
|
return [[[[self view] window] windowScene] interfaceOrientation];
|
|
} else {
|
|
return [[UIApplication sharedApplication] statusBarOrientation];
|
|
}
|
|
}
|
|
|
|
- (UIInterfaceOrientation)currentOrientation {
|
|
return currentOrientation;
|
|
}
|
|
|
|
- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
|
|
return [[iOS7AppDelegate iPhoneView] supportedScreenOrientations];
|
|
}
|
|
|
|
-(void) updateCurrentOrientation {
|
|
UIInterfaceOrientation interfaceOrientation = [self interfaceOrientation];
|
|
if (interfaceOrientation != UIInterfaceOrientationUnknown)
|
|
[self setCurrentOrientation: interfaceOrientation];
|
|
}
|
|
|
|
-(void) setCurrentOrientation:(UIInterfaceOrientation)orientation {
|
|
if (orientation != currentOrientation) {
|
|
currentOrientation = orientation;
|
|
[[iOS7AppDelegate iPhoneView] interfaceOrientationChanged:currentOrientation];
|
|
}
|
|
}
|
|
|
|
- (void)viewDidAppear:(BOOL)animated {
|
|
[super viewDidAppear:animated];
|
|
|
|
UIInterfaceOrientation orientation = [self interfaceOrientation];
|
|
if (orientation != UIInterfaceOrientationUnknown && orientation != currentOrientation) {
|
|
currentOrientation = orientation;
|
|
[[iOS7AppDelegate iPhoneView] interfaceOrientationChanged:orientation];
|
|
}
|
|
}
|
|
|
|
- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator {
|
|
[super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
|
|
|
|
// In iOS 16, make sure that the current orientation is updated when the
|
|
// function viewWillTransitionToSize is called to make sure it's updated
|
|
// when the adjustViewFrameForSafeArea is called. This makes sure that the
|
|
// screen size is updated correctly when forcing the orientation based on
|
|
// the backend user setting.
|
|
UIInterfaceOrientation orientationAfter = [self interfaceOrientation];
|
|
if (orientationAfter != UIInterfaceOrientationUnknown) {
|
|
[self setCurrentOrientation:orientationAfter];
|
|
}
|
|
// In iOS 15 (and below), set the current orientation when the transition
|
|
// animation finishes to make sure that the interface orientation has been
|
|
// updated to make sure the virtual controller is connected/disconnected
|
|
// properly based on the orientation.
|
|
[coordinator animateAlongsideTransition:nil completion:^(id<UIViewControllerTransitionCoordinatorContext> context) {
|
|
UIInterfaceOrientation orientation = [self interfaceOrientation];
|
|
if (orientation != UIInterfaceOrientationUnknown) {
|
|
[self setCurrentOrientation:orientation];
|
|
if (@available(iOS 11.0, *)) {
|
|
[self setNeedsUpdateOfScreenEdgesDeferringSystemGestures];
|
|
}
|
|
}
|
|
}];
|
|
}
|
|
#endif
|
|
|
|
@end
|