[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - vcl/quartz
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Mar 13 08:40:19 UTC 2019
vcl/quartz/salgdicommon.cxx | 11 -----------
1 file changed, 11 deletions(-)
New commits:
commit 9efe3886f69cbed2fd9f7ad031af352632bd8ecd
Author: Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Mar 13 10:38:01 2019 +0200
Commit: Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Mar 13 10:38:01 2019 +0200
Revert "Temporary hack to make iOS app dialogs look better"
Not surprisingly, it broke everything else.
This reverts commit 30d012a391857cc240407890dd1ac80fa28358de.
diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index cbca6fe3fdf9..d1beb08c1a66 100644
--- a/vcl/quartz/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -22,7 +22,6 @@
#include <cassert>
#include <cstring>
-#include <comphelper/lok.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
#include <osl/endian.h>
#include <osl/file.hxx>
@@ -37,7 +36,6 @@
#endif
#include <quartz/utils.h>
#ifdef IOS
-#include <UIKit/UIKit.h>
#include "saldatabasic.hxx"
#endif
#include <sft.hxx>
@@ -1388,15 +1386,6 @@ void AquaSalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY )
rDPIY = mnRealDPIY;
#else
rDPIX = rDPIY = 96;
- if (comphelper::LibreOfficeKit::isActive())
- {
- // Horrible, ugly hack. This is the WRONG way to get the dialogs in the iOS app to look
- // sane. (But I could not figure out the RIGHT way...) This hack does help in the sense that
- // it makes the widgets in the dialogs sanely sized and not overlapping, but the text in the
- // dialogs ends up quite fuzzy.
- rDPIX /= [[UIScreen mainScreen] scale];
- rDPIY /= [[UIScreen mainScreen] scale];
- }
#endif
}
More information about the Libreoffice-commits
mailing list