Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Change color of button bar for Dark Mode (Console)
- Loading branch information
Showing
6 changed files
with
190 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| // | ||
| // SPButtonBar.h | ||
| // sequel-pro | ||
| // | ||
| // Created by Max Lohrmann on 16.07.18. | ||
| // Copyright (c) 2018 Max Lohrmann. All rights reserved. | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person | ||
| // obtaining a copy of this software and associated documentation | ||
| // files (the "Software"), to deal in the Software without | ||
| // restriction, including without limitation the rights to use, | ||
| // copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| // copies of the Software, and to permit persons to whom the | ||
| // Software is furnished to do so, subject to the following | ||
| // conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be | ||
| // included in all copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES | ||
| // OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| // NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | ||
| // HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | ||
| // WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
| // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
| // OTHER DEALINGS IN THE SOFTWARE. | ||
| // | ||
| // More info at <https://github.com/sequelpro/sequelpro> | ||
|
|
||
| /** | ||
| * This view can be used as the background for button bars displayed at the bottom of the window | ||
| * in various places. | ||
| * On 10.14+ it will automatically adapt to the Dark UI mode. | ||
| * | ||
| * Since Apple's complete "documentation" of Dark mode resources consists of "Just use Asset | ||
| * Catalogs. Oh btw, that'll only work in Xcode 10 and OS X 10.14.", I guess this will be the | ||
| * alternative to using file formats that are ten times more volatile than the Mac hardware lineup. | ||
| */ | ||
| @interface SPButtonBar : NSView | ||
| { | ||
| NSImage *lightImage; | ||
| NSImage *darkImage; | ||
| } | ||
|
|
||
| - (instancetype)init NS_UNAVAILABLE; | ||
|
|
||
| @end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| // | ||
| // SPButtonBar.m | ||
| // sequel-pro | ||
| // | ||
| // Created by Max Lohrmann on 16.07.18. | ||
| // Copyright (c) 2018 Max Lohrmann. All rights reserved. | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person | ||
| // obtaining a copy of this software and associated documentation | ||
| // files (the "Software"), to deal in the Software without | ||
| // restriction, including without limitation the rights to use, | ||
| // copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| // copies of the Software, and to permit persons to whom the | ||
| // Software is furnished to do so, subject to the following | ||
| // conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be | ||
| // included in all copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES | ||
| // OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| // NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT | ||
| // HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, | ||
| // WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
| // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
| // OTHER DEALINGS IN THE SOFTWARE. | ||
| // | ||
| // More info at <https://github.com/sequelpro/sequelpro> | ||
|
|
||
| #import "SPButtonBar.h" | ||
| #import "SPOSInfo.h" | ||
|
|
||
| static BOOL isOSAtLeast10_14 = NO; | ||
|
|
||
| static void init(SPButtonBar *obj); | ||
|
|
||
| @interface SPButtonBar () | ||
|
|
||
| - (BOOL)isInDarkMode; | ||
|
|
||
| @end | ||
|
|
||
| @implementation SPButtonBar | ||
|
|
||
| + (void)initialize | ||
| { | ||
| isOSAtLeast10_14 = [SPOSInfo isOSVersionAtLeastMajor:10 minor:14 patch:0]; | ||
| } | ||
|
|
||
| - (instancetype)init | ||
| { | ||
| [NSException raise:NSInternalInconsistencyException format:@"%s is not a valid initializer for class!",__func__]; | ||
| return nil; // compiler hint | ||
| } | ||
|
|
||
| - (instancetype)initWithFrame:(NSRect)frameRect //designated initializer of super | ||
| { | ||
| if(self = [super initWithFrame:frameRect]) { | ||
| init(self); | ||
| } | ||
| return self; | ||
| } | ||
|
|
||
| - (instancetype)initWithCoder:(NSCoder *)decoder //designated initializer of super | ||
| { | ||
| if(self = [super initWithCoder:decoder]) { | ||
| init(self); | ||
| } | ||
| return self; | ||
| } | ||
|
|
||
| void init(SPButtonBar *obj) | ||
| { | ||
| obj->lightImage = [[NSImage imageNamed:@"button_bar_spacer"] retain]; | ||
| obj->darkImage = [[NSImage imageNamed:@"button_bar_spacer_dark"] retain]; | ||
| } | ||
|
|
||
| - (void)dealloc | ||
| { | ||
| SPClear(lightImage); | ||
| SPClear(darkImage); | ||
| [super dealloc]; | ||
| } | ||
|
|
||
| - (BOOL)isInDarkMode | ||
| { | ||
| if(isOSAtLeast10_14) { | ||
| NSString *match = [[self effectiveAppearance] bestMatchFromAppearancesWithNames:@[NSAppearanceNameAqua, NSAppearanceNameDarkAqua]]; | ||
| if ([NSAppearanceNameDarkAqua isEqualToString:match]) { | ||
| return YES; | ||
| } | ||
| } | ||
| return NO; | ||
| } | ||
|
|
||
| - (void)drawRect:(NSRect)dirtyRect | ||
| { | ||
| [super drawRect:dirtyRect]; | ||
|
|
||
| NSImage *img = ([self isInDarkMode] ? darkImage : lightImage); | ||
| NSRect drawFrame = [self frame]; | ||
| drawFrame.origin.x = dirtyRect.origin.x; | ||
| drawFrame.size.width = dirtyRect.size.width; | ||
| [img drawInRect:drawFrame fromRect:NSZeroRect operation:NSCompositeCopy fraction:1.0]; | ||
| } | ||
|
|
||
| @end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters