Revision: 29775
http://sourceforge.net/p/bibdesk/svn/29775
Author: hofman
Date: 2025-11-09 09:30:25 +0000 (Sun, 09 Nov 2025)
Log Message:
-----------
rename enum and values
Modified Paths:
--------------
trunk/bibdesk/BDSKEdgeView.h
trunk/bibdesk/BDSKEdgeView.m
trunk/bibdesk/BDSKEditor.m
trunk/bibdesk/BDSKFileContentSearchController.m
trunk/bibdesk/BDSKSearchGroupViewController.m
trunk/bibdesk/BDSKTextImportController.m
trunk/bibdesk/BDSKWebGroupViewController.m
trunk/bibdesk/BibDocument_Search.m
Modified: trunk/bibdesk/BDSKEdgeView.h
===================================================================
--- trunk/bibdesk/BDSKEdgeView.h 2025-11-07 10:33:57 UTC (rev 29774)
+++ trunk/bibdesk/BDSKEdgeView.h 2025-11-09 09:30:25 UTC (rev 29775)
@@ -40,18 +40,18 @@
NS_ASSUME_NONNULL_BEGIN
-typedef NS_OPTIONS(NSUInteger, BDSKRectEdgeMask) {
- BDSKNoEdgeMask = 0,
- BDSKMinXEdgeMask = 1 << NSMinXEdge,
- BDSKMinYEdgeMask = 1 << NSMinYEdge,
- BDSKMaxXEdgeMask = 1 << NSMaxXEdge,
- BDSKMaxYEdgeMask = 1 << NSMaxYEdge,
- BDSKEveryEdgeMask = BDSKMinXEdgeMask | BDSKMinYEdgeMask | BDSKMaxXEdgeMask
| BDSKMaxYEdgeMask,
+typedef NS_OPTIONS(NSUInteger, BDSKRectEdges) {
+ BDSKRectEdgesNone = 0,
+ BDSKRectEdgesMinX = 1 << NSMinXEdge,
+ BDSKRectEdgesMinY = 1 << NSMinYEdge,
+ BDSKRectEdgesMaxX = 1 << NSMaxXEdge,
+ BDSKRectEdgesMaxY = 1 << NSMaxYEdge,
+ BDSKRectEdgesEvery = BDSKRectEdgesMinX | BDSKRectEdgesMinY |
BDSKRectEdgesMaxX | BDSKRectEdgesMaxY,
};
@interface BDSKEdgeView : NSView {
NSView *contentView;
- BDSKRectEdgeMask edges;
+ BDSKRectEdges edges;
NSMutableArray *edgeColors;
NSArray *backgroundColors;
NSView *backgroundView;
@@ -66,7 +66,7 @@
@property (nonatomic, nullable, strong) NSView *backgroundView;
-@property (nonatomic) BDSKRectEdgeMask edges;
+@property (nonatomic) BDSKRectEdges edges;
@property (nonatomic, nullable, copy) NSArray *backgroundColors;
Modified: trunk/bibdesk/BDSKEdgeView.m
===================================================================
--- trunk/bibdesk/BDSKEdgeView.m 2025-11-07 10:33:57 UTC (rev 29774)
+++ trunk/bibdesk/BDSKEdgeView.m 2025-11-09 09:30:25 UTC (rev 29775)
@@ -68,7 +68,7 @@
wantsSubviews = NO;
NSColor *color;
NSColor *topColor;
- edges = BDSKNoEdgeMask; // we start with no edge, so we can use this
in IB without getting weird offsets
+ edges = BDSKRectEdgesNone; // we start with no edge, so we can use
this in IB without getting weird offsets
if (@available(macOS 10.14, *)) {
color = topColor = [NSColor separatorColor];
backgroundColors = nil;
@@ -195,7 +195,7 @@
}
}
-- (void)setEdges:(BDSKRectEdgeMask)mask {
+- (void)setEdges:(BDSKRectEdges)mask {
if (mask != edges) {
edges = mask;
[contentView setFrame:[self contentRect]];
@@ -241,7 +241,7 @@
}
if (NSWidth(rect) < 0.0) {
- if ((edges & (BDSKMaxXEdgeMask | BDSKMinXEdgeMask)) ==
BDSKMinXEdgeMask)
+ if ((edges & (BDSKRectEdgesMaxX | BDSKRectEdgesMinX)) ==
BDSKRectEdgesMinX)
rect.origin.x = BORDER_SIZE;
else
rect.origin.x = 0.0;
@@ -248,7 +248,7 @@
rect.size.width = 0.0;
}
if (NSHeight(rect) < 0.0) {
- if ((edges & (BDSKMaxYEdgeMask | BDSKMinYEdgeMask)) ==
BDSKMinYEdgeMask)
+ if ((edges & (BDSKRectEdgesMaxY | BDSKRectEdgesMinY)) ==
BDSKRectEdgesMinY)
rect.origin.y = BORDER_SIZE;
else
rect.origin.y = 0.0;
Modified: trunk/bibdesk/BDSKEditor.m
===================================================================
--- trunk/bibdesk/BDSKEditor.m 2025-11-07 10:33:57 UTC (rev 29774)
+++ trunk/bibdesk/BDSKEditor.m 2025-11-09 09:30:25 UTC (rev 29775)
@@ -208,7 +208,7 @@
[self toggleStatusBar:nil];
BDSKEdgeView *edgeView = (BDSKEdgeView *)[[[collectionView
enclosingScrollView] superview] superview];
- [edgeView setEdges:BDSKMaxYEdgeMask];
+ [edgeView setEdges:BDSKRectEdgesMaxY];
[edgeView setColor:[edgeView colorForEdge:NSMinYEdge] forEdge:NSMaxYEdge];
[edgeView setBackgroundColors:nil];
[edgeView setBackgroundView:nil];
Modified: trunk/bibdesk/BDSKFileContentSearchController.m
===================================================================
--- trunk/bibdesk/BDSKFileContentSearchController.m 2025-11-07 10:33:57 UTC
(rev 29774)
+++ trunk/bibdesk/BDSKFileContentSearchController.m 2025-11-09 09:30:25 UTC
(rev 29775)
@@ -92,7 +92,7 @@
[tableView setStyle:NSTableViewStyleFullWidth];
// Do custom view setup
- [controlView setEdges:BDSKMinYEdgeMask];
+ [controlView setEdges:BDSKRectEdgesMinY];
[controlView setColor:[controlView colorForEdge:NSMaxYEdge]
forEdge:NSMinYEdge];
// we might remove this, so keep a retained reference
Modified: trunk/bibdesk/BDSKSearchGroupViewController.m
===================================================================
--- trunk/bibdesk/BDSKSearchGroupViewController.m 2025-11-07 10:33:57 UTC
(rev 29774)
+++ trunk/bibdesk/BDSKSearchGroupViewController.m 2025-11-09 09:30:25 UTC
(rev 29775)
@@ -60,7 +60,7 @@
[super viewDidLoad];
BDSKEdgeView *edgeView = (BDSKEdgeView *)[self view];
- [edgeView setEdges:BDSKMinYEdgeMask];
+ [edgeView setEdges:BDSKRectEdgesMinY];
[edgeView setColor:[edgeView colorForEdge:NSMaxYEdge] forEdge:NSMinYEdge];
}
Modified: trunk/bibdesk/BDSKTextImportController.m
===================================================================
--- trunk/bibdesk/BDSKTextImportController.m 2025-11-07 10:33:57 UTC (rev
29774)
+++ trunk/bibdesk/BDSKTextImportController.m 2025-11-09 09:30:25 UTC (rev
29775)
@@ -203,7 +203,7 @@
if (@available(macOS 10.14, *))
[sourceTextView setDrawsBackground:NO];
- [webViewBox setEdges:BDSKEveryEdgeMask];
+ [webViewBox setEdges:BDSKRectEdgesEvery];
[webViewBox setBackgroundColors:nil];
[webViewBox setBackgroundView:nil];
Modified: trunk/bibdesk/BDSKWebGroupViewController.m
===================================================================
--- trunk/bibdesk/BDSKWebGroupViewController.m 2025-11-07 10:33:57 UTC (rev
29774)
+++ trunk/bibdesk/BDSKWebGroupViewController.m 2025-11-09 09:30:25 UTC (rev
29775)
@@ -95,7 +95,7 @@
// navigation views
BDSKEdgeView *edgeView = (BDSKEdgeView *)[self view];
- [edgeView setEdges:BDSKMinYEdgeMask];
+ [edgeView setEdges:BDSKRectEdgesMinY];
[edgeView setColor:[edgeView colorForEdge:NSMaxYEdge] forEdge:NSMinYEdge];
[edgeView setReflectViewEnabled:NO];
Modified: trunk/bibdesk/BibDocument_Search.m
===================================================================
--- trunk/bibdesk/BibDocument_Search.m 2025-11-07 10:33:57 UTC (rev 29774)
+++ trunk/bibdesk/BibDocument_Search.m 2025-11-09 09:30:25 UTC (rev 29775)
@@ -296,7 +296,7 @@
- (void)makeSearchButtonView {
searchButtonEdgeView = [[BDSKEdgeView alloc] initWithFrame:NSMakeRect(0.0,
0.0, 0.0, 29.0)];
- [searchButtonEdgeView setEdges:BDSKMinYEdgeMask];
+ [searchButtonEdgeView setEdges:BDSKRectEdgesMinY];
[searchButtonEdgeView setTranslatesAutoresizingMaskIntoConstraints:NO];
[[[searchButtonEdgeView heightAnchor] constraintEqualToConstant:29.0]
setActive:YES];
if ([searchButtonEdgeView backgroundColors])
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
