Revert "Temporary fix for UI initialization bug"
This reverts commit 256cd3846d.
This commit is contained in:
1 parent
256cd3846d
commit
bc084c8112
4 files changed
+11
-10
No files matched your search
@@ -193,12 +193,11 @@
|
||||
if ([selected isKindOfClass:UIViewController.class]) {
|
||||
[contentNavigationController setViewControllers:@[selected] animated:NO]; //YES?
|
||||
|
||||
/*if (@available(iOS 14.0, tvOS 14.0, *)) {
|
||||
if (@available(iOS 14.0, tvOS 14.0, *)) {
|
||||
selected.navigationItem.leftBarButtonItem = self.accountBtnItem;
|
||||
// It is unnecessary to put the toggle button as it is automated on iOS 14+
|
||||
return;
|
||||
}*/
|
||||
|
||||
}
|
||||
selected.navigationItem.leftBarButtonItems = @[self.splitViewController.displayModeButtonItem, self.accountBtnItem];
|
||||
selected.navigationItem.leftItemsSupplementBackButton = true;
|
||||
} else {
|
||||
|
||||
@@ -53,9 +53,11 @@ extern NSMutableDictionary *prefDict;
|
||||
self.preferredDisplayMode = UISplitViewControllerDisplayModeSecondaryOnly;
|
||||
}
|
||||
}
|
||||
/*if (@available(iOS 14.0, tvOS 14.0, *)) {
|
||||
self.preferredSplitBehavior = UISplitViewControllerSplitBehaviorOverlay;
|
||||
}*/
|
||||
if (@available(iOS 14.0, tvOS 14.0, *)) {
|
||||
self.preferredSplitBehavior = isPortrait ?
|
||||
UISplitViewControllerSplitBehaviorOverlay :
|
||||
UISplitViewControllerSplitBehaviorTile;
|
||||
}
|
||||
}
|
||||
|
||||
- (void)dismissViewController {
|
||||
|
||||
@@ -128,10 +128,10 @@ void launchInitialViewController(UIWindow *window) {
|
||||
if ([getPreference(@"internal_launch_on_boot") boolValue]) {
|
||||
window.rootViewController = [[SurfaceViewController alloc] init];
|
||||
} else {
|
||||
//if (@available(iOS 14.0, tvOS 14.0, *)) {
|
||||
// window.rootViewController = [[LauncherSplitViewController alloc] initWithStyle:UISplitViewControllerStyleDoubleColumn];
|
||||
//} else {
|
||||
if (@available(iOS 14.0, tvOS 14.0, *)) {
|
||||
window.rootViewController = [[LauncherSplitViewController alloc] initWithStyle:UISplitViewControllerStyleDoubleColumn];
|
||||
} else {
|
||||
window.rootViewController = [[LauncherSplitViewController alloc] init];
|
||||
//}
|
||||
}
|
||||
}
|
||||
}
|
||||
Binary file not shown.
Reference in new issue
Block a user