summaryrefslogtreecommitdiff
path: root/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-11-22 15:35:16 +0000
committerTomaž Vajngerl <quikee@gmail.com>2016-11-23 22:40:58 +0000
commitd9a6e0023c9a192850b9db00f8120fbcc4256ec9 (patch)
tree41e3ea0e81c4f0bc1581e61919ef3d0db6711c42 /vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
parentd689ad29c28ad7f077c2239a8fa4c2b6307a6aa1 (diff)
Resolves: tdf#99508 ensure sufficient size for hidpi backing surface
and match virtual device scale with widget device scale Change-Id: I1f35dcbaec94be12758ad6e4276bfd6bda4b1e88 Reviewed-on: https://gerrit.libreoffice.org/31080 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Jenkins <ci@libreoffice.org> Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx')
-rw-r--r--vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
index f3edc2bc6a0c..8090f6857e9b 100644
--- a/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gtk3salnativewidgets-gtk.cxx
@@ -3117,7 +3117,7 @@ void GtkSalGraphics::GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY)
int nScaleFactor = 1;
#if GTK_CHECK_VERSION(3, 10, 0)
- nScaleFactor = gdk_window_get_scale_factor(widget_get_window(mpWindow));
+ nScaleFactor = GtkSalFrame::getDisplay()->IsOwnHiDpiScale() ? gtk_widget_get_scale_factor(mpWindow) : 1;
#endif
if (fResolution > 0.0)