Revision: 13751
http://sourceforge.net/p/skim-app/code/13751
Author: hofman
Date: 2023-11-12 17:50:30 +0000 (Sun, 12 Nov 2023)
Log Message:
-----------
Change apearrance of objects inside @available blocks without convenience
functions
Modified Paths:
--------------
trunk/NSGraphics_SKExtensions.h
trunk/NSGraphics_SKExtensions.m
trunk/SKBasePDFView.m
trunk/SKLevelIndicatorCell.m
trunk/SKLoupeController.m
trunk/SKMainWindowController.m
trunk/SKNavigationWindow.m
trunk/SKSideWindow.m
trunk/SKTextNoteEditor.m
Modified: trunk/NSGraphics_SKExtensions.h
===================================================================
--- trunk/NSGraphics_SKExtensions.h 2023-11-12 17:33:28 UTC (rev 13750)
+++ trunk/NSGraphics_SKExtensions.h 2023-11-12 17:50:30 UTC (rev 13751)
@@ -39,9 +39,6 @@
#import <Cocoa/Cocoa.h>
extern BOOL SKHasDarkAppearance(id object);
-extern void SKSetHasDarkAppearance(id object);
-extern void SKSetHasLightAppearance(id object);
-extern void SKSetHasDefaultAppearance(id object);
extern void SKRunWithAppearance(id object, void (^code)(void));
extern void SKRunWithLightAppearance(void (^code)(void));
Modified: trunk/NSGraphics_SKExtensions.m
===================================================================
--- trunk/NSGraphics_SKExtensions.m 2023-11-12 17:33:28 UTC (rev 13750)
+++ trunk/NSGraphics_SKExtensions.m 2023-11-12 17:50:30 UTC (rev 13751)
@@ -69,27 +69,6 @@
return NO;
}
-void SKSetHasDarkAppearance(id object) {
- if (@available(macOS 10.14, *)) {
- if ([object respondsToSelector:@selector(setAppearance:)])
- [(id<NSAppearanceCustomization>)object setAppearance:[NSAppearance
appearanceNamed:NSAppearanceNameDarkAqua]];
- }
-}
-
-void SKSetHasLightAppearance(id object) {
- if (@available(macOS 10.14, *)) {
- if ([object respondsToSelector:@selector(setAppearance:)])
- [(id<NSAppearanceCustomization>)object setAppearance:[NSAppearance
appearanceNamed:NSAppearanceNameAqua]];
- }
-}
-
-void SKSetHasDefaultAppearance(id object) {
- if (@available(macOS 10.14, *)) {
- if ([object respondsToSelector:@selector(setAppearance:)])
- [(id<NSAppearanceCustomization>)object setAppearance:nil];
- }
-}
-
void SKRunWithAppearance(id object, void (^code)(void)) {
NSAppearance *appearance = nil;
if ([object respondsToSelector:@selector(effectiveAppearance)]) {
Modified: trunk/SKBasePDFView.m
===================================================================
--- trunk/SKBasePDFView.m 2023-11-12 17:33:28 UTC (rev 13750)
+++ trunk/SKBasePDFView.m 2023-11-12 17:50:30 UTC (rev 13751)
@@ -79,10 +79,10 @@
// make sure we don't use the same method name as a superclass or a subclass
- (void)commonBaseInitialization {
if (@available(macOS 10.14, *)) {
- SKSetHasDefaultAppearance(self);
- SKSetHasLightAppearance([[self scrollView] contentView]);
+ [self setAppearance:nil];
+ [[[self scrollView] contentView] setAppearance:[NSAppearance
appearanceNamed:NSAppearanceNameAqua]];
if ([[NSUserDefaults standardUserDefaults]
boolForKey:SKInvertColorsInDarkModeKey])
- SKSetHasLightAppearance([self scrollView]);
+ [[self scrollView] setAppearance:[NSAppearance
appearanceNamed:NSAppearanceNameAqua]];
if (@available(macOS 10.15, *)) {} else if (@available(macOS 10.14,
*)) {
[self handleScrollerStyleChangedNotification:nil];
@@ -128,10 +128,11 @@
}
- (void)colorFiltersDidChange {
- if ([[NSUserDefaults standardUserDefaults]
boolForKey:SKInvertColorsInDarkModeKey]) {
- SKSetHasLightAppearance([self scrollView]);
- } else {
- SKSetHasDefaultAppearance([self scrollView]);
+ if (@available(macOS 10.14, *)) {
+ if ([[NSUserDefaults standardUserDefaults]
boolForKey:SKInvertColorsInDarkModeKey])
+ [[self scrollView] setAppearance:[NSAppearance
appearanceNamed:NSAppearanceNameAqua]];
+ else
+ [[self scrollView] setAppearance:nil];
}
[[self scrollView] setContentFilters:SKColorEffectFilters()];
}
@@ -143,12 +144,14 @@
}
- (void)handleScrollerStyleChangedNotification:(NSNotification *)notification {
- if ([NSScroller preferredScrollerStyle] == NSScrollerStyleLegacy) {
- SKSetHasDefaultAppearance([[self scrollView] verticalScroller]);
- SKSetHasDefaultAppearance([[self scrollView] horizontalScroller]);
- } else {
- SKSetHasLightAppearance([[self scrollView] verticalScroller]);
- SKSetHasLightAppearance([[self scrollView] horizontalScroller]);
+ if (@available(macOS 10.14, *)) {
+ if ([NSScroller preferredScrollerStyle] == NSScrollerStyleLegacy) {
+ [[[self scrollView] verticalScroller] setAppearance:nil];
+ [[[self scrollView] horizontalScroller] setAppearance:nil];
+ } else {
+ [[[self scrollView] verticalScroller] setAppearance:[NSAppearance
appearanceNamed:NSAppearanceNameAqua]];
+ [[[self scrollView] horizontalScroller]
setAppearance:[NSAppearance appearanceNamed:NSAppearanceNameAqua]];
+ }
}
}
Modified: trunk/SKLevelIndicatorCell.m
===================================================================
--- trunk/SKLevelIndicatorCell.m 2023-11-12 17:33:28 UTC (rev 13750)
+++ trunk/SKLevelIndicatorCell.m 2023-11-12 17:50:30 UTC (rev 13751)
@@ -95,11 +95,13 @@
}
- (void)setBackgroundStyle:(NSBackgroundStyle)backgroundStyle {
- if ([self levelIndicatorStyle] == NSLevelIndicatorStyleRelevancy && [[self
controlView] isKindOfClass:[NSLevelIndicator class]]) {
- if (backgroundStyle == NSBackgroundStyleDark)
- SKSetHasDarkAppearance([self controlView]);
- else
- SKSetHasDefaultAppearance([self controlView]);
+ if (@available(macOS 10.14, *)) {
+ if ([self levelIndicatorStyle] == NSLevelIndicatorStyleRelevancy &&
[[self controlView] isKindOfClass:[NSLevelIndicator class]]) {
+ if (backgroundStyle == NSBackgroundStyleDark)
+ [[self controlView] setAppearance:[NSAppearance
appearanceNamed:NSAppearanceNameDarkAqua]];
+ else
+ [[self controlView] setAppearance:nil];
+ }
}
[super setBackgroundStyle:backgroundStyle];
}
Modified: trunk/SKLoupeController.m
===================================================================
--- trunk/SKLoupeController.m 2023-11-12 17:33:28 UTC (rev 13750)
+++ trunk/SKLoupeController.m 2023-11-12 17:50:30 UTC (rev 13751)
@@ -172,10 +172,12 @@
- (void)updateColorFilters {
[[window contentView] setContentFilters:SKColorEffectFilters()];
- if ([[NSUserDefaults standardUserDefaults]
boolForKey:SKInvertColorsInDarkModeKey])
- SKSetHasLightAppearance(window);
- else
- SKSetHasDefaultAppearance(window);
+ if (@available(macOS 10.14, *)) {
+ if ([[NSUserDefaults standardUserDefaults]
boolForKey:SKInvertColorsInDarkModeKey])
+ [window setAppearance:[NSAppearance
appearanceNamed:NSAppearanceNameAqua]];
+ else
+ [window setAppearance:nil];
+ }
[self updateBackgroundColor];
}
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2023-11-12 17:33:28 UTC (rev 13750)
+++ trunk/SKMainWindowController.m 2023-11-12 17:50:30 UTC (rev 13751)
@@ -1698,10 +1698,10 @@
if (@available(macOS 10.14, *)) {
if (isPresentation) {
- SKSetHasDarkAppearance(overviewContentView);
+ [overviewContentView setAppearance:[NSAppearance
appearanceNamed:NSAppearanceNameDarkAqua]];
[(NSVisualEffectView *)[overviewView backgroundView]
setMaterial:NSVisualEffectMaterialUnderPageBackground];
} else {
- SKSetHasDefaultAppearance(overviewContentView);
+ [overviewContentView setAppearance:nil];
[(NSVisualEffectView *)[overviewView backgroundView]
setMaterial:NSVisualEffectMaterialSidebar];
}
} else {
Modified: trunk/SKNavigationWindow.m
===================================================================
--- trunk/SKNavigationWindow.m 2023-11-12 17:33:28 UTC (rev 13750)
+++ trunk/SKNavigationWindow.m 2023-11-12 17:50:30 UTC (rev 13751)
@@ -98,7 +98,8 @@
[self setContentView:contentView];
[contentView release];
- SKSetHasDarkAppearance(self);
+ if (@available(macOS 10.14, *))
+ [self setAppearance:[NSAppearance
appearanceNamed:NSAppearanceNameDarkAqua]];
}
return self;
Modified: trunk/SKSideWindow.m
===================================================================
--- trunk/SKSideWindow.m 2023-11-12 17:33:28 UTC (rev 13750)
+++ trunk/SKSideWindow.m 2023-11-12 17:50:30 UTC (rev 13751)
@@ -96,7 +96,7 @@
[contentView release];
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(contentViewFrameChanged:)
name:NSViewFrameDidChangeNotification object:contentView];
[self contentViewFrameChanged:nil];
- SKSetHasDarkAppearance(self);
+ [self setAppearance:[NSAppearance
appearanceNamed:NSAppearanceNameAqua]];
} else {
[self setContentView:backgroundView];
}
Modified: trunk/SKTextNoteEditor.m
===================================================================
--- trunk/SKTextNoteEditor.m 2023-11-12 17:33:28 UTC (rev 13750)
+++ trunk/SKTextNoteEditor.m 2023-11-12 17:50:30 UTC (rev 13751)
@@ -71,7 +71,8 @@
for (NSString *key in [[self class] keysToObserve])
[annotation addObserver:self forKeyPath:key options:0
context:&SKPDFAnnotationPropertiesObservationContext];
- SKSetHasLightAppearance(self);
+ if (@available(macOS 10.14, *))
+ [self setAppearance:[NSAppearance
appearanceNamed:NSAppearanceNameAqua]];
}
return self;
}
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
