diff options
| author | Tor Lillqvist <tml@collabora.com> | 2021-01-27 14:36:00 +0200 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2021-01-27 20:26:30 +0100 |
| commit | 90a7e0bef20ad309c5215bd5c24bc7b8b5efa6ba (patch) | |
| tree | ee4bab2eaee9002dd5b6376afd55144849abedd9 | |
| parent | a3a200cc4fe45a96e66e602f908a52e95e96480a (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>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110015
Tested-by: Jenkins
(cherry picked from commit 02bb41dd5197503d0d8b7d8be0a8cd220c0d1c85)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109988
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
(cherry picked from commit 1f400d35d61076c460a28b2b83dddc9297f38140)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109991
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.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 87d81d2ac5d8..49b0b2af4e67 100644 --- a/vcl/osx/salinst.cxx +++ b/vcl/osx/salinst.cxx @@ -321,14 +321,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]; |