diff options
| author | Thorsten Wagner <thorsten.wagner.4@gmail.com> | 2021-01-10 23:49:25 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2021-01-18 00:25:20 +0100 |
| commit | f55352d5e79980c358653d18008ac047dc3e0118 (patch) | |
| tree | 8b7b88a2cb298bd85f39b33058854fe648fe9279 /desktop | |
| parent | c70e427cefd2a257f624f0fbb9bc343f3eb89bcc (diff) | |
tdf#138122 Add window scaling for retina displays on macOS, plus fixes for iOS
(1) Remove hack to make application look as if being linked against SDK 10.13
(2) Use quad storage size on virtual devices for displaying on retina displays thereafter
(3) Apply workaround to downsample bitmaps from scaled layers (to be implemented)
(4) Disable dark mode (to be implemented)
(5) Provide new environment variables:
VCL_MACOS_FORCE_WINDOW_SCALING:
window scaling on non retina displays
VCL_MACOS_FORCE_DARK_MODE:
enable dark mode (macOS 10.14, iOS 13 and newer)
VCL_MACOS_USE_SYSTEM_APPEARANCE:
use light mode or dark mode (macOS 10.14, iOS 13 and newer) as configured by system preferences
In this branch, this change also contains the below follow-up fix by
tml in order to pass Jenkins for iOS:
Make vcl compile again for iOS and make the Collabora Office iOS app
work again when built against a master build of core.
For now, keep the old versions of the functions touched by [this
change] in vcl/ios/salios.cxx, and move the modified versions to the
new file vcl/osx/salmacos.cxx.
Keep the functions as they were except that ifdefs for MACOSX or IOS
are expanded. Keep the formatting as it was to make comparisons
easier. Thus add the new files to the clang-format exclusion list.
While at it, also move vcl/quartz/salgdiutils.cxx to vcl/osx as it is
compiled only for macOS anyway.
Change-Id: I99877cd62a98cb91bcbf27af62b043c31c5f5fc9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109072
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109493
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/Executable_soffice_bin.mk | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/desktop/Executable_soffice_bin.mk b/desktop/Executable_soffice_bin.mk index ecf75893ab96..cabd31af29f2 100644 --- a/desktop/Executable_soffice_bin.mk +++ b/desktop/Executable_soffice_bin.mk @@ -31,19 +31,6 @@ $(eval $(call gb_Executable_set_ldflags,\ endif -ifeq ($(OS)-$(HAVE_MACOS_LD_PLATFORMVERSION),MACOSX-TRUE) -# At least when building against SDK 10.15, changing the LC_VERSION_MIN_MACOSX load command's sdk -# value from 10.15 to "n/a" (i.e., 0.0.0) is necessary to avoid blurry text in the LO UI (see -# <https://github.com/llvm/llvm-project/commit/25ce33a6e4f3b13732c0f851e68390dc2acb9123> -# "[driver][darwin] Pass -platform_version flag to the linker instead of the -# -<platform>_version_min flag", clang/test/Driver/darwin-ld-platform-version-macos.c in particular, -# for the -platform_version that Clang passes by default to new-enough ld): -$(eval $(call gb_Executable_add_ldflags,soffice_bin, \ - -Xlinker -platform_version -Xlinker macos -Xlinker $(MAC_OS_X_VERSION_MIN_REQUIRED_DOTS) \ - -Xlinker 0.0.0 \ -)) -endif - ifeq ($(OS),WNT) $(eval $(call gb_Executable_set_targettype_gui,soffice_bin,NO)) |