mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-20 18:17:20 +00:00
Code Issues Releases Activity

Fix macOS compatibility versions for vibrant dark theme (bug#28415)

Browse Source 
* src/nsterm.m (ns_set_appearance, EmacsView::initFrameFromEmacs):
Change macOS compatibility from 10.9 to 10.10.
This commit is contained in:
Alan Third 2017-09-11 17:15:13 +01:00
parent 7004545244
commit aa4bb9de9d
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/nsterm.m
View File

@ -2040,17 +2040,17 @@ so some key presses (TAB) are swallowed by the system. */
void
ns_set_appearance (struct frame *f, Lisp_Object new_value, Lisp_Object old_value)
{
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1090
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
EmacsView *view = (EmacsView *)FRAME_NS_VIEW (f);
NSWindow *window = [view window];
NSTRACE ("ns_set_appearance");
#ifndef NSAppKitVersionNumber10_9
#define NSAppKitVersionNumber10_9 1265
#ifndef NSAppKitVersionNumber10_10
#define NSAppKitVersionNumber10_10 1343
#endif
if (NSAppKitVersionNumber < NSAppKitVersionNumber10_9)
if (NSAppKitVersionNumber < NSAppKitVersionNumber10_10)
return;
if (EQ (new_value, Qdark))
@ -2065,7 +2065,7 @@ so some key presses (TAB) are swallowed by the system. */
appearanceNamed: NSAppearanceNameAqua];
FRAME_NS_APPEARANCE (f) = ns_appearance_aqua;
}
#endif /* MAC_OS_X_VERSION_MAX_ALLOWED >= 1090 */
#endif /* MAC_OS_X_VERSION_MAX_ALLOWED >= 101000 */
}
void
@ -7135,12 +7135,12 @@ - (instancetype) initFrameFromEmacs: (struct frame *)f
if (! FRAME_UNDECORATED (f))
[self createToolbar: f];
#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1090
#ifndef NSAppKitVersionNumber10_9
#define NSAppKitVersionNumber10_9 1265
#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= 101000
#ifndef NSAppKitVersionNumber10_10
#define NSAppKitVersionNumber10_10 1343
#endif
if (NSAppKitVersionNumber >= NSAppKitVersionNumber10_9
if (NSAppKitVersionNumber >= NSAppKitVersionNumber10_10
&& FRAME_NS_APPEARANCE (f) != ns_appearance_aqua)
win.appearance = [NSAppearance
appearanceNamed: NSAppearanceNameVibrantDark];