[Bibdesk-commit] SF.net SVN: bibdesk:[28841] trunk/bibdesk

[hofman--- via Bibdesk-commit]

Revision: 28841
          http://sourceforge.net/p/bibdesk/svn/28841
Author:   hofman
Date:     2024-03-12 17:27:03 +0000 (Tue, 12 Mar 2024)
Log Message:
-----------
remove convenience methods to find constraints for a view

Modified Paths:
--------------
    trunk/bibdesk/BDSKBookmarkController.m
    trunk/bibdesk/BDSKSearchBookmarkController.m
    trunk/bibdesk/NSView_BDSKExtensions.h
    trunk/bibdesk/NSView_BDSKExtensions.m

Modified: trunk/bibdesk/BDSKBookmarkController.m
===================================================================
--- trunk/bibdesk/BDSKBookmarkController.m      2024-03-12 17:21:17 UTC (rev 
28840)
+++ trunk/bibdesk/BDSKBookmarkController.m      2024-03-12 17:27:03 UTC (rev 
28841)
@@ -49,7 +49,6 @@
 #import "NSURL_BDSKExtensions.h"
 #import "NSPasteboard_BDSKExtensions.h"
 #import "NSAnimationContext_BDSKExtensions.h"
-#import "NSView_BDSKExtensions.h"
 #import "NSTableView_BDSKExtensions.h"
 
 #define BDSKBookmarksWindowFrameAutosaveName @"BDSKBookmarksWindow"
@@ -611,8 +610,14 @@
     NSTableCellView *view = [ov makeViewWithIdentifier:identifier owner:self];
     if (@available(macOS 11.0, *)) {} else {
         BOOL isLast = [[tableColumn identifier] isEqualToString:@"url"];
-        if (isLast || isSep)
-            [[view constraintWithFirstItem:view 
firstAttribute:NSLayoutAttributeTrailing] setConstant:isSep == NO ? 4.0 : 
isLast ? 2.0 : 0.0];
+        if (isLast || isSep) {
+            for (NSLayoutConstraint *constraint in [view constraints]) {
+                if ([constraint firstItem] == view && [constraint 
firstAttribute] == NSLayoutAttributeTrailing) {
+                    [constraint setConstant:isSep == NO ? 4.0 : isLast ? 2.0 : 
0.0];
+                    break;
+                }
+            }
+        }
     }
     if ([identifier isEqualToString:@"url"])
         [[view textField] setEnabled:[item bookmarkType] == 
BDSKBookmarkTypeBookmark];

Modified: trunk/bibdesk/BDSKSearchBookmarkController.m
===================================================================
--- trunk/bibdesk/BDSKSearchBookmarkController.m        2024-03-12 17:21:17 UTC 
(rev 28840)
+++ trunk/bibdesk/BDSKSearchBookmarkController.m        2024-03-12 17:27:03 UTC 
(rev 28841)
@@ -45,7 +45,6 @@
 #import "BDSKOutlineView.h"
 #import "NSWindowController_BDSKExtensions.h"
 #import "NSAnimationContext_BDSKExtensions.h"
-#import "NSView_BDSKExtensions.h"
 #import "NSTableView_BDSKExtensions.h"
 #import "NSPasteboard_BDSKExtensions.h"
 
@@ -585,8 +584,14 @@
     NSTableCellView *view = [ov makeViewWithIdentifier:identifier owner:self];
     if (@available(macOS 11.0, *)) {} else {
         BOOL isLast = [[tableColumn identifier] isEqualToString:@"server"];
-        if (isLast || isSep)
-            [[view constraintWithFirstItem:view 
firstAttribute:NSLayoutAttributeTrailing] setConstant:isSep == NO ? 4.0 : 
isLast ? 2.0 : 0.0];
+        if (isLast || isSep) {
+            for (NSLayoutConstraint *constraint in [view constraints]) {
+                if ([constraint firstItem] == view && [constraint 
firstAttribute] == NSLayoutAttributeTrailing) {
+                    [constraint setConstant:isSep == NO ? 4.0 : isLast ? 2.0 : 
0.0];
+                    break;
+                }
+            }
+        }
     }
     if ([identifier isEqualToString:@"server"])
         [[view textField] setTextColor:[item bookmarkType] == 
BDSKSearchBookmarkTypeBookmark ? [NSColor controlTextColor] : [NSColor 
disabledControlTextColor]];

Modified: trunk/bibdesk/NSView_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/NSView_BDSKExtensions.h       2024-03-12 17:21:17 UTC (rev 
28840)
+++ trunk/bibdesk/NSView_BDSKExtensions.h       2024-03-12 17:27:03 UTC (rev 
28841)
@@ -76,7 +76,4 @@
 - (NSPoint)convertPointToScreen:(NSPoint)point;
 - (NSPoint)convertPointFromScreen:(NSPoint)point;
 
-- (NSLayoutConstraint *)constraintWithFirstItem:(id)item 
firstAttribute:(NSLayoutAttribute)attribute;
-- (NSLayoutConstraint *)constraintWithSecondItem:(id)item 
secondAttribute:(NSLayoutAttribute)attribute;
-
 @end

Modified: trunk/bibdesk/NSView_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSView_BDSKExtensions.m       2024-03-12 17:21:17 UTC (rev 
28840)
+++ trunk/bibdesk/NSView_BDSKExtensions.m       2024-03-12 17:27:03 UTC (rev 
28841)
@@ -152,22 +152,6 @@
     return [self convertPoint:[[self window] 
convertRectFromScreen:rect].origin fromView:nil];
 }
 
-- (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;
-}
-
 @end
 
 

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