vcl/headless/svpgdi.cxx | 8 ++++++++
1 file changed, 8 insertions(+)
New commits:
commit 73d6205f9d66e95a2d833c9338b1116209bd33a9
Author: Jan Holesovsky <[email protected]>
AuthorDate: Fri Dec 20 15:27:50 2019 +0100
Commit: Michael Meeks <[email protected]>
CommitDate: Sat May 23 16:47:49 2020 +0100
android: Make the Calc input bar working on the Android device too.
Thanks to Marco Ceccheti! - he's found what was wrong there.
Change-Id: I45500f7f55ced60965a42ad6cb8032481594b409
Reviewed-on: https://gerrit.libreoffice.org/85612
Reviewed-by: Jan Holesovsky <[email protected]>
Tested-by: Jan Holesovsky <[email protected]>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86089
Reviewed-by: Michael Meeks <[email protected]>
Tested-by: Michael Meeks <[email protected]>
diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index b6571382ccd9..afdeb98a4788 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -2204,14 +2204,21 @@ GlyphCache& SvpSalGraphics::getPlatformGlyphCache()
void dl_cairo_surface_set_device_scale(cairo_surface_t *surface, double
x_scale, double y_scale)
{
+#ifdef ANDROID
+ cairo_surface_set_device_scale(surface, x_scale, y_scale);
+#else
static auto func = reinterpret_cast<void(*)(cairo_surface_t*, double,
double)>(
dlsym(nullptr, "cairo_surface_set_device_scale"));
if (func)
func(surface, x_scale, y_scale);
+#endif
}
void dl_cairo_surface_get_device_scale(cairo_surface_t *surface, double*
x_scale, double* y_scale)
{
+#ifdef ANDROID
+ cairo_surface_get_device_scale(surface, x_scale, y_scale);
+#else
static auto func = reinterpret_cast<void(*)(cairo_surface_t*, double*,
double*)>(
dlsym(nullptr, "cairo_surface_get_device_scale"));
if (func)
@@ -2223,6 +2230,7 @@ void dl_cairo_surface_get_device_scale(cairo_surface_t
*surface, double* x_scale
if (y_scale)
*y_scale = 1.0;
}
+#endif
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
