Revision: 25847
http://sourceforge.net/p/bibdesk/svn/25847
Author: hofman
Date: 2021-05-03 16:44:38 +0000 (Mon, 03 May 2021)
Log Message:
-----------
No need to handle non auto layout preference panes
Modified Paths:
--------------
trunk/bibdesk/BDSKPreferenceController.m
Modified: trunk/bibdesk/BDSKPreferenceController.m
===================================================================
--- trunk/bibdesk/BDSKPreferenceController.m 2021-05-03 16:30:57 UTC (rev
25846)
+++ trunk/bibdesk/BDSKPreferenceController.m 2021-05-03 16:44:38 UTC (rev
25847)
@@ -155,31 +155,12 @@
[iconView setAction:@selector(iconViewShowPane:)];
[iconView setTarget:self];
- CGFloat width = [iconView translatesAutoresizingMaskIntoConstraints] ?
NSWidth([iconView frame]) : [iconView fittingSize].width;
- for (BDSKPreferencePane *pane in [panes objectEnumerator]) {
- if ([[pane view] translatesAutoresizingMaskIntoConstraints])
- width = fmax(width, NSWidth([[pane view] frame]));
- else
- width = fmax(width, [[pane view] fittingSize].width);
- }
+ CGFloat width = [iconView fittingSize].width;
+ for (BDSKPreferencePane *pane in [panes objectEnumerator])
+ width = fmax(width, [[pane view] fittingSize].width);
NSRect frame = [window frame];
frame.size.width = width;
[window setFrame:frame display:NO];
- if ([iconView translatesAutoresizingMaskIntoConstraints]) {
- frame = [iconView frame];
- frame.size.width = width;
- [iconView setFrame:frame];
- [iconView setAutoresizingMask:NSViewMaxYMargin];
- }
- CGFloat controlHeight = [controlView fittingSize].height;
- for (BDSKPreferencePane *pane in [panes objectEnumerator]) {
- if ([[pane view] translatesAutoresizingMaskIntoConstraints]) {
- frame = [[pane view] frame];
- frame.origin = NSMakePoint(floor(0.5 * (width - NSWidth(frame))),
controlHeight);
- [[pane view] setFrame:frame];
- [[pane view] setAutoresizingMask:NSViewMaxYMargin];
- }
- }
[self changeContentView:iconView from:nil display:NO];
@@ -601,14 +582,9 @@
BOOL isIcons = [view isEqual:[self iconView]];
NSRect contentRect = [window contentRectForFrameRect:[window frame]];
- CGFloat contentHeight;
- if ([view translatesAutoresizingMaskIntoConstraints]) {
- contentHeight = NSMaxY([view frame]);
- } else {
- contentHeight = [view fittingSize].height;
- if (isIcons == NO)
- contentHeight += [controlView fittingSize].height;
- }
+ CGFloat contentHeight = [view fittingSize].height;
+ if (isIcons == NO)
+ contentHeight += [controlView fittingSize].height;
contentRect.origin.y = NSMaxY(contentRect) - contentHeight;
contentRect.size.height = contentHeight;
contentRect = [window frameRectForContentRect:contentRect];
@@ -623,21 +599,18 @@
if (NSMaxY(contentRect) > NSMaxY(screenRect))
contentRect.origin.y = NSMaxY(screenRect) - NSHeight(contentRect);
- NSArray *oontrolsConstraints = nil;
- NSArray *constraints = nil;
+ NSArray *controlsConstraints = nil;
if (wasIcons)
- oontrolsConstraints = [NSArray arrayWithObjects:
+ controlsConstraints = [NSArray arrayWithObjects:
[NSLayoutConstraint constraintWithItem:controlView
attribute:NSLayoutAttributeLeading relatedBy:NSLayoutRelationEqual
toItem:contentView attribute:NSLayoutAttributeLeading multiplier:1.0
constant:0.0],
[NSLayoutConstraint constraintWithItem:controlView
attribute:NSLayoutAttributeTrailing relatedBy:NSLayoutRelationEqual
toItem:contentView attribute:NSLayoutAttributeTrailing multiplier:1.0
constant:0.0],
[NSLayoutConstraint constraintWithItem:controlView
attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual
toItem:contentView attribute:NSLayoutAttributeBottom multiplier:1.0
constant:0.0], nil];
- if ([view translatesAutoresizingMaskIntoConstraints] == NO) {
- constraints = [NSArray arrayWithObjects:
- [NSLayoutConstraint constraintWithItem:view
attribute:NSLayoutAttributeLeading relatedBy:NSLayoutRelationEqual
toItem:contentView attribute:NSLayoutAttributeLeading multiplier:1.0
constant:0.0],
- [NSLayoutConstraint constraintWithItem:view
attribute:NSLayoutAttributeCenterX relatedBy:NSLayoutRelationEqual
toItem:contentView attribute:NSLayoutAttributeCenterX multiplier:1.0
constant:0.0],
- [NSLayoutConstraint constraintWithItem:view
attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual
toItem:isIcons ? contentView : controlView attribute:isIcons ?
NSLayoutAttributeBottom : NSLayoutAttributeTop multiplier:1.0 constant:0.0],
nil];
- if (isIcons == NO)
- [[constraints firstObject] setPriority:100.0];
- }
+ NSArray *constraints = [NSArray arrayWithObjects:
+ [NSLayoutConstraint constraintWithItem:view
attribute:NSLayoutAttributeLeading relatedBy:NSLayoutRelationEqual
toItem:contentView attribute:NSLayoutAttributeLeading multiplier:1.0
constant:0.0],
+ [NSLayoutConstraint constraintWithItem:view
attribute:NSLayoutAttributeCenterX relatedBy:NSLayoutRelationEqual
toItem:contentView attribute:NSLayoutAttributeCenterX multiplier:1.0
constant:0.0],
+ [NSLayoutConstraint constraintWithItem:view
attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual
toItem:isIcons ? contentView : controlView attribute:isIcons ?
NSLayoutAttributeBottom : NSLayoutAttributeTop multiplier:1.0 constant:0.0],
nil];
+ if (isIcons == NO)
+ [[constraints firstObject] setPriority:100.0];
NSTimeInterval duration = [NSAnimationContext
defaultAnimationTimeInterval];
if (display && duration > 0.0) {
@@ -648,7 +621,7 @@
[[controlView animator] removeFromSuperview];
} else if (wasIcons) {
[[contentView animator] addSubview:controlView];
- [contentView addConstraints:oontrolsConstraints];
+ [contentView addConstraints:controlsConstraints];
}
if ([oldView superview]) {
[[contentView animator] replaceSubview:oldView with:view];
@@ -655,8 +628,7 @@
} else {
[[contentView animator] addSubview:view];
}
- if (constraints)
- [contentView addConstraints:constraints];
+ [contentView addConstraints:constraints];
[[window animator] setFrame:contentRect display:YES];
}
completionHandler:^{
@@ -667,13 +639,12 @@
[controlView removeFromSuperview];
} else if (wasIcons) {
[contentView addSubview:controlView];
- [contentView addConstraints:oontrolsConstraints];
+ [contentView addConstraints:controlsConstraints];
}
// don't use replaceSubview:with: because oldView can be nil here
[oldView removeFromSuperview];
[contentView addSubview:view];
- if (constraints)
- [contentView addConstraints:constraints];
+ [contentView addConstraints:constraints];
[window setFrame:contentRect display:display];
[window recalculateKeyViewLoop];
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
Bibdesk-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
