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

Merge branch 'bugfix/hidden_panels_hidden' into 'develop'

Browse Source 
hide the panels when not showing

See merge request BPHV_MIPS/mvm_core_ui!796
This commit is contained in:
Hedden, Kyle Matthew 2022-01-18 22:09:13 +00:00
commit ea24e12909
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -337,6 +337,7 @@ CGFloat const PanelAnimationDuration = 0.2;
}; };
void (^completion)(BOOL) = ^(BOOL finished){ void (^completion)(BOOL) = ^(BOOL finished){
self.leftView.hidden = true;
self.mainViewCoverView.hidden = YES; self.mainViewCoverView.hidden = YES;
[self panelDidDisappear:self.leftPanel animated:animated]; [self panelDidDisappear:self.leftPanel animated:animated];
self.mainView.accessibilityElementsHidden = NO; self.mainView.accessibilityElementsHidden = NO;
@ -360,6 +361,7 @@ CGFloat const PanelAnimationDuration = 0.2;
return; return;
} }
[MVMCoreDispatchUtility performBlockOnMainThread:^{ [MVMCoreDispatchUtility performBlockOnMainThread:^{
self.leftView.hidden = false;
if (self.mainViewLeading.constant < .1) { if (self.mainViewLeading.constant < .1) {
BOOL shouldExtendLeftPanel = [self shouldExtendLeftPanel]; BOOL shouldExtendLeftPanel = [self shouldExtendLeftPanel];
@ -540,6 +542,7 @@ CGFloat const PanelAnimationDuration = 0.2;
}; };
void (^completion)(BOOL) = ^(BOOL finished){ void (^completion)(BOOL) = ^(BOOL finished){
self.rightView.hidden = true;
self.mainViewCoverView.hidden = YES; self.mainViewCoverView.hidden = YES;
[self panelDidDisappear:self.rightPanel animated:animated]; [self panelDidDisappear:self.rightPanel animated:animated];
self.mainView.accessibilityElementsHidden = NO; self.mainView.accessibilityElementsHidden = NO;
@ -563,6 +566,7 @@ CGFloat const PanelAnimationDuration = 0.2;
return; return;
} }
[MVMCoreDispatchUtility performBlockOnMainThread:^{ [MVMCoreDispatchUtility performBlockOnMainThread:^{
self.rightView.hidden = false;
if (self.mainViewTrailing.constant < .1) { if (self.mainViewTrailing.constant < .1) {
BOOL shouldExtendRightPanel = [self shouldExtendRightPanel]; BOOL shouldExtendRightPanel = [self shouldExtendRightPanel];
@ -726,9 +730,9 @@ CGFloat const PanelAnimationDuration = 0.2;
[self addPanel:panel]; [self addPanel:panel];
self.leftView = panel.view; self.leftView = panel.view;
self.leftPanel = panel; self.leftPanel = panel;
self.leftView.hidden = YES;
self.leftView.translatesAutoresizingMaskIntoConstraints = NO; self.leftView.translatesAutoresizingMaskIntoConstraints = NO;
NSLayoutConstraint *leftPanelWidth = [NSLayoutConstraint constraintWithItem:self.leftView attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.0 constant:270]; NSLayoutConstraint *leftPanelWidth = [NSLayoutConstraint constraintWithItem:self.leftView attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.0 constant:270];
self.leftView.translatesAutoresizingMaskIntoConstraints = NO;
leftPanelWidth.active = YES; leftPanelWidth.active = YES;
self.leftPanelWidth = leftPanelWidth; self.leftPanelWidth = leftPanelWidth;
[NSLayoutConstraint constraintWithItem:self.mainView attribute:NSLayoutAttributeLeft relatedBy:NSLayoutRelationEqual toItem:self.leftView attribute:NSLayoutAttributeRight multiplier:1.0 constant:0].active = YES; [NSLayoutConstraint constraintWithItem:self.mainView attribute:NSLayoutAttributeLeft relatedBy:NSLayoutRelationEqual toItem:self.leftView attribute:NSLayoutAttributeRight multiplier:1.0 constant:0].active = YES;
@ -762,6 +766,7 @@ CGFloat const PanelAnimationDuration = 0.2;
[self addPanel:panel]; [self addPanel:panel];
self.rightView = panel.view; self.rightView = panel.view;
self.rightPanel = panel; self.rightPanel = panel;
self.rightView.hidden = YES;
self.rightView.translatesAutoresizingMaskIntoConstraints = NO; self.rightView.translatesAutoresizingMaskIntoConstraints = NO;
NSLayoutConstraint *rightPanelWidth = [NSLayoutConstraint constraintWithItem:self.rightView attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.0 constant:270]; NSLayoutConstraint *rightPanelWidth = [NSLayoutConstraint constraintWithItem:self.rightView attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.0 constant:270];
rightPanelWidth.active = YES; rightPanelWidth.active = YES;