mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix/panel_button_order' into 'develop'

Browse Source 
Bugfix/panel button order

See merge request BPHV_MIPS/mvm_core_ui!504
This commit is contained in:
Suresh, Kamlesh Jain 2020-06-17 22:25:33 -04:00
commit 4bafce1750
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m
View File

@ -237,12 +237,12 @@ CGFloat const PanelAnimationDuration = 0.2;
- (void)setLeftNavigationItemForViewController:(UIViewController * _Nonnull)viewController accessible:(BOOL)accessible extended:(BOOL)extended { - (void)setLeftNavigationItemForViewController:(UIViewController * _Nonnull)viewController accessible:(BOOL)accessible extended:(BOOL)extended {
NSMutableArray *leftBarButtonItems = [NSMutableArray array]; NSMutableArray *leftBarButtonItems = [NSMutableArray array];
NSArray *extraButtons = [self additionalLeftButtonsForViewController:viewController]; NSArray *extraButtons = [self additionalLeftButtonsForViewController:viewController];
if (extraButtons) {
[leftBarButtonItems addObjectsFromArray:extraButtons];
}
if ((accessible && !extended) && self.leftPanelButton && ![extraButtons containsObject:self.leftPanelButton]) { if ((accessible && !extended) && self.leftPanelButton && ![extraButtons containsObject:self.leftPanelButton]) {
[leftBarButtonItems addObject:self.leftPanelButton]; [leftBarButtonItems addObject:self.leftPanelButton];
} }
if (extraButtons) {
[leftBarButtonItems addObjectsFromArray:extraButtons];
}
[viewController.navigationItem setLeftBarButtonItems:(leftBarButtonItems.count > 0 ? leftBarButtonItems : nil) animated:!DisableAnimations]; [viewController.navigationItem setLeftBarButtonItems:(leftBarButtonItems.count > 0 ? leftBarButtonItems : nil) animated:!DisableAnimations];
} }
@ -1069,6 +1069,7 @@ CGFloat const PanelAnimationDuration = 0.2;
if ([self.rightPanelButton respondsToSelector:@selector(setIconColor:)]) { if ([self.rightPanelButton respondsToSelector:@selector(setIconColor:)]) {
[((UIBarButtonItem <MVMCoreUIPanelButtonProtocol>*)self.rightPanelButton) setIconColor:color]; [((UIBarButtonItem <MVMCoreUIPanelButtonProtocol>*)self.rightPanelButton) setIconColor:color];
} }
[self.backButton setTintColor:color];
} }
@end @end