Revision: 15355
http://sourceforge.net/p/skim-app/code/15355
Author: hofman
Date: 2025-06-03 14:21:01 +0000 (Tue, 03 Jun 2025)
Log Message:
-----------
check for unified toolbar style before calling function
Modified Paths:
--------------
trunk/SKMainWindowController_FullScreen.m
Modified: trunk/SKMainWindowController_FullScreen.m
===================================================================
--- trunk/SKMainWindowController_FullScreen.m 2025-06-03 14:17:58 UTC (rev
15354)
+++ trunk/SKMainWindowController_FullScreen.m 2025-06-03 14:21:01 UTC (rev
15355)
@@ -524,8 +524,6 @@
}
static inline CGFloat toolbarViewOffset(NSWindow *window) {
- if (hasUnifiedToolbar(window))
- return 0.0;
NSToolbar *toolbar = [window toolbar];
NSView *view = nil;
if ([toolbar displayMode] == NSToolbarDisplayModeLabelOnly) {
@@ -536,9 +534,7 @@
if ((view = [item view]))
break;
}
- if (view)
- return NSMaxY([view convertRectToScreen:[view frame]]) - NSMaxY([[view
window] frame]);
- return 0.0;
+ return view ? NSMaxY([view convertRectToScreen:[view frame]]) -
NSMaxY([[view window] frame]) : 0.0;
}
- (void)windowWillEnterFullScreenStyle:(NSWindow *)window {
@@ -602,7 +598,7 @@
NSTitlebarAccessoryViewController *noteToolbar = nil;
CALayer *blackLayer = nil;
if (showToolbarInFullScreen(window)) {
- if (fullScreenToolbarOffset <= 0.0)
+ if (fullScreenToolbarOffset <= 0.0 && hasUnifiedToolbar(window) == NO)
fullScreenToolbarOffset = toolbarViewOffset(window);
CGFloat offset = fullScreenOffset(window);
frame.size.height += offset;
@@ -642,7 +638,7 @@
}
- (void)windowDidEnterFullScreen:(NSNotification *)notification {
- if (fullScreenToolbarOffset < 0.0 && showToolbarInFullScreen([self
window])) {
+ if (fullScreenToolbarOffset < 0.0 && showToolbarInFullScreen([self
window]) && hasUnifiedToolbar([self window]) == NO) {
CGFloat toolbarItemOffset = toolbarViewOffset([self window]);
if (toolbarItemOffset < 0.0)
// save the offset for the next time, we may guess it wrong as it
varies between OS versions
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
