Revision: 15833
http://sourceforge.net/p/skim-app/code/15833
Author: hofman
Date: 2025-11-25 17:30:12 +0000 (Tue, 25 Nov 2025)
Log Message:
-----------
avoid shadowed variable, import header for selector
Modified Paths:
--------------
trunk/SKMainToolbarController.m
trunk/SKNavigationWindow.m
trunk/SKNoteToolbarController.m
Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m 2025-11-25 17:20:48 UTC (rev 15832)
+++ trunk/SKMainToolbarController.m 2025-11-25 17:30:12 UTC (rev 15833)
@@ -63,6 +63,7 @@
#import "NSGraphics_SKExtensions.h"
#import "SKNoteToolbarController.h"
#import "NSObject_SKExtensions.h"
+#import "SKApplicationController.h"
#define SKDocumentToolbarIdentifier @"SKDocumentToolbar"
Modified: trunk/SKNavigationWindow.m
===================================================================
--- trunk/SKNavigationWindow.m 2025-11-25 17:20:48 UTC (rev 15832)
+++ trunk/SKNavigationWindow.m 2025-11-25 17:30:12 UTC (rev 15833)
@@ -213,14 +213,7 @@
[closeButton setPath:closeButtonPath(rect.size)];
[[self contentView] addSubview:closeButton];
- NSScreen *screen = [[presentationView window] screen] ?: [NSScreen
mainScreen];
- NSRect frame;
- frame.size.width = 5 * BUTTON_WIDTH + 3 * SEP_WIDTH + 2 *
BUTTON_MARGIN;
- frame.size.height = BUTTON_HEIGHT + 2.0 * BUTTON_MARGIN;
- frame.origin.x = NSMidX([screen frame]) - 0.5 * NSWidth(frame);
- frame.origin.y = NSMinY([screen frame]) + WINDOW_OFFSET;
- [self setFrame:frame display:NO];
- [(NSVisualEffectView *)[self contentView] setMaskImage:[NSImage
maskImageWithSize:frame.size cornerRadius:CORNER_RADIUS]];
+ [(NSVisualEffectView *)[self contentView] setMaskImage:[NSImage
maskImageWithSize:contentRect.size cornerRadius:CORNER_RADIUS]];
}
return self;
}
@@ -352,7 +345,6 @@
[closeButton sizeToFit];
[[self contentView] addSubview:closeButton];
- NSScreen *screen = [[presentationView window] screen] ?: [NSScreen
mainScreen];
NSRect frame;
frame.size.width = NSWidth([styleButton frame]) +
NSWidth([removeShadowButton frame]) + NSWidth([drawButton frame]) +
NSWidth([closeButton frame]) + 2.0 * BUTTON_MARGIN + 2.0 * SMALL_SEP_WIDTH;
frame.size.height = NSHeight(rect) + 2.0 * BUTTON_MARGIN;
Modified: trunk/SKNoteToolbarController.m
===================================================================
--- trunk/SKNoteToolbarController.m 2025-11-25 17:20:48 UTC (rev 15832)
+++ trunk/SKNoteToolbarController.m 2025-11-25 17:30:12 UTC (rev 15833)
@@ -47,6 +47,7 @@
#import "NSColor_SKExtensions.h"
#import "NSSegmentedControl_SKExtensions.h"
#import "SKStringConstants.h"
+#import "SKApplicationController.h"
static char SKDefaultsObservationContext;
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
