nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-14 12:52:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #19 Layout now gets restored correctly after unlocking with hidden ispector

Browse Source
This commit is contained in:
michael starke
2013-06-17 21:04:37 +02:00
parent a8b930cf60
commit e76195565c
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
MacPass/MPDocumentWindowController.m
View File

@@ -215,6 +215,15 @@
NSView *inspectorView = [_inspectorViewController view]; NSView *inspectorView = [_inspectorViewController view];
NSView *entryView = [_entryViewController view]; NSView *entryView = [_entryViewController view];
/*
The current easy way to prevent layout hickups is to add the inspect
Add all neded contraints an then remove it again, if it was hidden
*/
BOOL removeInspector = NO;
if(![inspectorView superview]) {
[_splitView addSubview:inspectorView];
removeInspector = YES;
}
NSDictionary *views = NSDictionaryOfVariableBindings(outlineView, inspectorView, entryView, _splitView); NSDictionary *views = NSDictionaryOfVariableBindings(outlineView, inspectorView, entryView, _splitView);
[self.splitView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[outlineView(>=150,<=250)]-1-[entryView(>=300)]-1-[inspectorView(>=200)]|" [self.splitView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[outlineView(>=150,<=250)]-1-[entryView(>=300)]-1-[inspectorView(>=200)]|"
options:0 options:0
@@ -232,6 +241,7 @@
options:0 options:0
metrics:nil metrics:nil
views:views]]; views:views]];
NSNumber *border = @([[self window] contentBorderThicknessForEdge:NSMinYEdge]); NSNumber *border = @([[self window] contentBorderThicknessForEdge:NSMinYEdge]);
[contentView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[_splitView]-border-|" [contentView addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[_splitView]-border-|"
options:0 options:0
@@ -241,7 +251,10 @@
options:0 options:0
metrics:nil metrics:nil
views:views]]; views:views]];
/* Restore the State the inspector view was in before the view change */
if(removeInspector) {
[inspectorView removeFromSuperview];
}
[contentView layout]; [contentView layout];
[_entryViewController updateResponderChain]; [_entryViewController updateResponderChain];
[_inspectorViewController updateResponderChain]; [_inspectorViewController updateResponderChain];