Revision: 14056
http://sourceforge.net/p/skim-app/code/14056
Author: hofman
Date: 2024-02-18 18:50:46 +0000 (Sun, 18 Feb 2024)
Log Message:
-----------
search for contraint in specialized functions where they are needed
Modified Paths:
--------------
trunk/NSView_SKExtensions.h
trunk/NSView_SKExtensions.m
trunk/SKBookmarkController.m
trunk/SKStatusBar.m
Modified: trunk/NSView_SKExtensions.h
===================================================================
--- trunk/NSView_SKExtensions.h 2024-02-18 18:24:52 UTC (rev 14055)
+++ trunk/NSView_SKExtensions.h 2024-02-18 18:50:46 UTC (rev 14056)
@@ -60,9 +60,6 @@
- (void)activateConstraintsToSuperview;
-- (nullable NSLayoutConstraint *)constraintWithFirstItem:(id)item
firstAttribute:(NSLayoutAttribute)attribute;
-- (nullable NSLayoutConstraint *)constraintWithSecondItem:(id)item
secondAttribute:(NSLayoutAttribute)attribute;
-
@property (class, nonatomic, readonly) BOOL shouldShowSlideAnimation;
@property (class, nonatomic, readonly) BOOL shouldShowFadeAnimation;
Modified: trunk/NSView_SKExtensions.m
===================================================================
--- trunk/NSView_SKExtensions.m 2024-02-18 18:24:52 UTC (rev 14055)
+++ trunk/NSView_SKExtensions.m 2024-02-18 18:50:46 UTC (rev 14056)
@@ -109,22 +109,6 @@
[NSLayoutConstraint activateConstraints:constraints];
}
-- (NSLayoutConstraint *)constraintWithFirstItem:(id)item
firstAttribute:(NSLayoutAttribute)attribute {
- for (NSLayoutConstraint *constraint in [self constraints]) {
- if ([constraint firstItem] == item && [constraint firstAttribute] ==
attribute)
- return constraint;
- }
- return nil;
-}
-
-- (NSLayoutConstraint *)constraintWithSecondItem:(id)item
secondAttribute:(NSLayoutAttribute)attribute {
- for (NSLayoutConstraint *constraint in [self constraints]) {
- if ([constraint secondItem] == item && [constraint secondAttribute] ==
attribute)
- return constraint;
- }
- return nil;
-}
-
+ (BOOL)shouldShowSlideAnimation {
if ([[NSUserDefaults standardUserDefaults]
boolForKey:SKDisableAnimationsKey])
return NO;
Modified: trunk/SKBookmarkController.m
===================================================================
--- trunk/SKBookmarkController.m 2024-02-18 18:24:52 UTC (rev 14055)
+++ trunk/SKBookmarkController.m 2024-02-18 18:50:46 UTC (rev 14056)
@@ -96,6 +96,8 @@
static NSArray *minimumCoverForBookmarks(NSArray *items);
+static inline NSLayoutConstraint *trailingConstraint(NSView *view);
+
@interface SKBookmarkController (SKPrivate)
- (void)setupToolbar;
- (void)saveBookmarksData;
@@ -986,7 +988,7 @@
if (@available(macOS 11.0, *)) {} else {
BOOL isLast = [[tableColumn identifier] isEqualToString:PAGE_COLUMNID];
if (isLast || isSep)
- [[view constraintWithFirstItem:view
firstAttribute:NSLayoutAttributeTrailing] setConstant:isSep == NO ? 4.0 :
isLast ? 2.0 : 0.0];
+ [trailingConstraint(view) setConstant:isSep == NO ? 4.0 : isLast ?
2.0 : 0.0];
}
if ([identifier isEqualToString:FILE_COLUMNID]) {
if ([item bookmarkType] == SKBookmarkTypeBookmark)
@@ -1340,3 +1342,11 @@
}
@end
+
+static inline NSLayoutConstraint *trailingConstraint(NSView *view) {
+ for (NSLayoutConstraint *constraint in [view constraints]) {
+ if ([constraint firstItem] == view && [constraint firstAttribute] ==
NSLayoutAttributeTrailing)
+ return constraint;
+ }
+ return nil;
+}
Modified: trunk/SKStatusBar.m
===================================================================
--- trunk/SKStatusBar.m 2024-02-18 18:24:52 UTC (rev 14055)
+++ trunk/SKStatusBar.m 2024-02-18 18:50:46 UTC (rev 14056)
@@ -48,6 +48,7 @@
#define SEPARATION 4.0
#define ICON_OFFSET 1.0
+static inline NSLayoutConstraint *bottomLayoutConstraint(NSArray *constraints,
NSView *view);
@interface SKStatusTextField : NSTextField
@end
@@ -136,8 +137,7 @@
NSView *contentView = [view superview];
BOOL visible = (nil == [self superview]);
- NSView *bottomView = visible ? view : self;
- NSLayoutConstraint *bottomConstraint = [contentView
constraintWithSecondItem:bottomView secondAttribute:NSLayoutAttributeBottom];
+ NSLayoutConstraint *bottomConstraint = bottomLayoutConstraint([contentView
constraints], visible ? view : self);
CGFloat statusHeight = NSHeight([self frame]);
NSArray *constraints;
@@ -424,3 +424,11 @@
}
@end
+
+static inline NSLayoutConstraint *bottomLayoutConstraint(NSArray *constraints,
NSView *view) {
+ for (NSLayoutConstraint *constraint in constraints) {
+ if ([constraint secondItem] == view && [constraint secondAttribute] ==
NSLayoutAttributeBottom)
+ return constraint;
+ }
+ return nil;
+}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
