diff options
| author | Tor Lillqvist <tml@collabora.com> | 2021-01-27 14:36:00 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2021-01-27 13:59:24 +0100 |
| commit | 8f9231b97d06858b598c6fa819546ca3391d11c7 (patch) | |
| tree | 4f53cab8450c407bbd20f7eb8fcc12210c286bee | |
| parent | 87a3bbbf9088da4afae97d8209ddc7eae1979a07 (diff) | |
NSApplication's appearance property exists in macOS 10.14 and later only
Change-Id: I12f586d91e40da130f59eeba3ab65e07eec088d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110013
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
| -rw-r--r-- | vcl/osx/salinst.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx index a524f24f0293..b0899074cb4b 100644 --- a/vcl/osx/salinst.cxx +++ b/vcl/osx/salinst.cxx @@ -316,14 +316,16 @@ VCLPLUG_OSX_PUBLIC SalInstance* create_SalInstance() // TODO: After implementation of dark mode, this code has to be removed. - if (getenv("VCL_MACOS_FORCE_DARK_MODE")) + if (@available(macOS 10.14, iOS 13, *)) { - if (@available(macOS 10.14, iOS 13, *)) + if (getenv("VCL_MACOS_FORCE_DARK_MODE")) + { [NSApp setAppearance: [NSAppearance appearanceNamed: NSAppearanceNameDarkAqua]]; + } + else + if (!getenv("VCL_MACOS_USE_SYSTEM_APPEARANCE")) + [NSApp setAppearance: [NSAppearance appearanceNamed: NSAppearanceNameAqua]]; } - else - if (!getenv("VCL_MACOS_USE_SYSTEM_APPEARANCE")) - [NSApp setAppearance: [NSAppearance appearanceNamed: NSAppearanceNameAqua]]; // activate our delegate methods [NSApp setDelegate: NSApp]; |