Revision: 12130
          http://sourceforge.net/p/skim-app/code/12130
Author:   hofman
Date:     2021-02-26 17:50:33 +0000 (Fri, 26 Feb 2021)
Log Message:
-----------
Unify toolbar and titlebar of bookmark window

Modified Paths:
--------------
    trunk/SKBookmarkController.m
    trunk/SKCompatibility.h
    trunk/SKMainWindowController.m

Modified: trunk/SKBookmarkController.m
===================================================================
--- trunk/SKBookmarkController.m        2021-02-26 16:59:16 UTC (rev 12129)
+++ trunk/SKBookmarkController.m        2021-02-26 17:50:33 UTC (rev 12130)
@@ -188,6 +188,12 @@
     if ([[self window] respondsToSelector:@selector(setTabbingMode:)])
         [[self window] setTabbingMode:NSWindowTabbingModeDisallowed];
     
+    if ([[self window] respondsToSelector:@selector(setToolbarStyle:)])
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpartial-availability"
+        [[self window] setToolbarStyle:NSWindowToolbarStyleUnified];
+#pragma clang diagnostic pop
+    
     [self setWindowFrameAutosaveName:SKBookmarksWindowFrameAutosaveName];
     
     [[self window] setAutorecalculatesContentBorderThickness:NO 
forEdge:NSMinYEdge];

Modified: trunk/SKCompatibility.h
===================================================================
--- trunk/SKCompatibility.h     2021-02-26 16:59:16 UTC (rev 12129)
+++ trunk/SKCompatibility.h     2021-02-26 17:50:33 UTC (rev 12130)
@@ -186,3 +186,21 @@
 };
 
 #endif
+
+#if SDK_BEFORE(11_0)
+
+typedef NS_ENUM(NSInteger, NSWindowToolbarStyle) {
+    NSWindowToolbarStyleAutomatic,
+    NSWindowToolbarStyleExpanded,
+    NSWindowToolbarStylePreference,
+    NSWindowToolbarStyleUnified,
+    NSWindowToolbarStyleUnifiedCompact
+};
+
+@interface NSWindow (SKBigSurDeclarations)
+- (NSWindowToolbarStyle)toolbarStyle;
+- (void)setToolbarStyle:(NSWindowToolbarStyle)style;
+@end
+
+#endif
+

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m      2021-02-26 16:59:16 UTC (rev 12129)
+++ trunk/SKMainWindowController.m      2021-02-26 17:50:33 UTC (rev 12130)
@@ -189,20 +189,6 @@
 @end
 #endif
 
-#if SDK_BEFORE(11_0)
-typedef NS_ENUM(NSInteger, NSWindowToolbarStyle) {
-    NSWindowToolbarStyleAutomatic,
-    NSWindowToolbarStyleExpanded,
-    NSWindowToolbarStylePreference,
-    NSWindowToolbarStyleUnified,
-    NSWindowToolbarStyleUnifiedCompact
-};
-@interface NSWindow (SKBigSurExtensions)
-- (NSWindowToolbarStyle)toolbarStyle;
-- (void)setToolbarStyle:(NSWindowToolbarStyle)style;
-@end
-#endif
-
 #pragma mark -
 
 @interface SKMainWindowController (SKPrivate)

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

Reply via email to