diff options
| author | Alan Third | 2017-09-11 17:15:13 +0100 |
|---|---|---|
| committer | Alan Third | 2017-09-11 17:23:47 +0100 |
| commit | aa4bb9de9dffda0669321505b64bb5f4551b9358 (patch) | |
| tree | 99e608e56eac6e51269484421446868b9ee96a49 /src | |
| parent | 7004545244ea5efbe7a37db72431f982c70576e6 (diff) | |
| download | emacs-aa4bb9de9dffda0669321505b64bb5f4551b9358.tar.gz emacs-aa4bb9de9dffda0669321505b64bb5f4551b9358.zip | |
Fix macOS compatibility versions for vibrant dark theme (bug#28415)
* src/nsterm.m (ns_set_appearance, EmacsView::initFrameFromEmacs):
Change macOS compatibility from 10.9 to 10.10.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nsterm.m | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/nsterm.m b/src/nsterm.m index be97e94dd5d..001e4576e89 100644 --- a/src/nsterm.m +++ b/src/nsterm.m | |||
| @@ -2040,17 +2040,17 @@ x_set_z_group (struct frame *f, Lisp_Object new_value, Lisp_Object old_value) | |||
| 2040 | void | 2040 | void |
| 2041 | ns_set_appearance (struct frame *f, Lisp_Object new_value, Lisp_Object old_value) | 2041 | ns_set_appearance (struct frame *f, Lisp_Object new_value, Lisp_Object old_value) |
| 2042 | { | 2042 | { |
| 2043 | #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1090 | 2043 | #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000 |
| 2044 | EmacsView *view = (EmacsView *)FRAME_NS_VIEW (f); | 2044 | EmacsView *view = (EmacsView *)FRAME_NS_VIEW (f); |
| 2045 | NSWindow *window = [view window]; | 2045 | NSWindow *window = [view window]; |
| 2046 | 2046 | ||
| 2047 | NSTRACE ("ns_set_appearance"); | 2047 | NSTRACE ("ns_set_appearance"); |
| 2048 | 2048 | ||
| 2049 | #ifndef NSAppKitVersionNumber10_9 | 2049 | #ifndef NSAppKitVersionNumber10_10 |
| 2050 | #define NSAppKitVersionNumber10_9 1265 | 2050 | #define NSAppKitVersionNumber10_10 1343 |
| 2051 | #endif | 2051 | #endif |
| 2052 | 2052 | ||
| 2053 | if (NSAppKitVersionNumber < NSAppKitVersionNumber10_9) | 2053 | if (NSAppKitVersionNumber < NSAppKitVersionNumber10_10) |
| 2054 | return; | 2054 | return; |
| 2055 | 2055 | ||
| 2056 | if (EQ (new_value, Qdark)) | 2056 | if (EQ (new_value, Qdark)) |
| @@ -2065,7 +2065,7 @@ ns_set_appearance (struct frame *f, Lisp_Object new_value, Lisp_Object old_value | |||
| 2065 | appearanceNamed: NSAppearanceNameAqua]; | 2065 | appearanceNamed: NSAppearanceNameAqua]; |
| 2066 | FRAME_NS_APPEARANCE (f) = ns_appearance_aqua; | 2066 | FRAME_NS_APPEARANCE (f) = ns_appearance_aqua; |
| 2067 | } | 2067 | } |
| 2068 | #endif /* MAC_OS_X_VERSION_MAX_ALLOWED >= 1090 */ | 2068 | #endif /* MAC_OS_X_VERSION_MAX_ALLOWED >= 101000 */ |
| 2069 | } | 2069 | } |
| 2070 | 2070 | ||
| 2071 | void | 2071 | void |
| @@ -7135,12 +7135,12 @@ not_in_argv (NSString *arg) | |||
| 7135 | if (! FRAME_UNDECORATED (f)) | 7135 | if (! FRAME_UNDECORATED (f)) |
| 7136 | [self createToolbar: f]; | 7136 | [self createToolbar: f]; |
| 7137 | 7137 | ||
| 7138 | #if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1090 | 7138 | #if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= 101000 |
| 7139 | #ifndef NSAppKitVersionNumber10_9 | 7139 | #ifndef NSAppKitVersionNumber10_10 |
| 7140 | #define NSAppKitVersionNumber10_9 1265 | 7140 | #define NSAppKitVersionNumber10_10 1343 |
| 7141 | #endif | 7141 | #endif |
| 7142 | 7142 | ||
| 7143 | if (NSAppKitVersionNumber >= NSAppKitVersionNumber10_9 | 7143 | if (NSAppKitVersionNumber >= NSAppKitVersionNumber10_10 |
| 7144 | && FRAME_NS_APPEARANCE (f) != ns_appearance_aqua) | 7144 | && FRAME_NS_APPEARANCE (f) != ns_appearance_aqua) |
| 7145 | win.appearance = [NSAppearance | 7145 | win.appearance = [NSAppearance |
| 7146 | appearanceNamed: NSAppearanceNameVibrantDark]; | 7146 | appearanceNamed: NSAppearanceNameVibrantDark]; |