Use widget's logicalDpiX() instead of a screens

Fixes #34772 (cherry picked from commit e7ac0ee)
qgis · Mar 16, 2020 · 0e73f44 · 0e73f44
1 parent c6b2970
commit 0e73f44
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/doc/CONTRIBUTORS b/doc/CONTRIBUTORS
@@ -86,6 +86,7 @@ Shiva Reddy Koti
 Stefanie Tellex
 Steven Mizuno
 Tamas Szekeres
+Tim Tisler
 Tom Russo
 Tyler Mitchell
 Vita Cizek

diff --git a/src/app/qgsidentifyresultsdialog.cpp b/src/app/qgsidentifyresultsdialog.cpp
@@ -956,8 +956,7 @@ void QgsIdentifyResultsDialog::addFeature( QgsRasterLayer *layer,
 #if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
     const int horizontalDpi = qApp->desktop()->screen()->logicalDpiX();
 #else
-    QScreen *screen = QGuiApplication::screenAt( mapToGlobal( QPoint( width() / 2, 0 ) ) );
-    const int horizontalDpi = screen->logicalDotsPerInchX();
+    const int horizontalDpi = logicalDpiX();
 #endif
 
 

diff --git a/src/gui/editorwidgets/qgshtmlwidgetwrapper.cpp b/src/gui/editorwidgets/qgshtmlwidgetwrapper.cpp
@@ -50,8 +50,7 @@ void QgsHtmlWidgetWrapper::initWidget( QWidget *editor )
 #if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
   const int horizontalDpi = qApp->desktop()->screen()->logicalDpiX();
 #else
-  QScreen *screen = QGuiApplication::screenAt( mWidget->mapToGlobal( QPoint( mWidget->width() / 2, 0 ) ) );
-  const int horizontalDpi = screen->logicalDotsPerInchX();
+  const int horizontalDpi = mWidget->logicalDpiX();
 #endif
 
   mWidget->setZoomFactor( horizontalDpi / 96.0 );

diff --git a/src/gui/raster/qgsrasterlayerproperties.cpp b/src/gui/raster/qgsrasterlayerproperties.cpp
@@ -445,8 +445,7 @@ QgsRasterLayerProperties::QgsRasterLayerProperties( QgsMapLayer *lyr, QgsMapCanv
 #if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
   const int horizontalDpi = qApp->desktop()->screen()->logicalDpiX();
 #else
-  QScreen *screen = QGuiApplication::screenAt( mapToGlobal( QPoint( width() / 2, 0 ) ) );
-  const int horizontalDpi = screen->logicalDotsPerInchX();
+  const int horizontalDpi = logicalDpiX();
 #endif
 
   // Adjust zoom: text is ok, but HTML seems rather big at least on Linux/KDE