Skip to content

Commit

Permalink
Fix incorrect dpi used to render text format previews on qt 5.15
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Mar 31, 2021
1 parent 7715a12 commit 2a1ab9b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/core/labeling/qgspallabeling.cpp
Expand Up @@ -1309,7 +1309,7 @@ QPixmap QgsPalLayerSettings::labelSettingsPreviewPixmap( const QgsPalLayerSettin
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
const double logicalDpiX = QgsApplication::desktop()->logicalDpiX();
#else
const double logicalDpiX = QApplication::topLevelWidgets().first()->screen()->devicePixelRatio();
const double logicalDpiX = QApplication::topLevelWidgets().first()->screen()->logicalDotsPerInchX();
#endif
context.setScaleFactor( logicalDpiX / 25.4 );

Expand Down
2 changes: 1 addition & 1 deletion src/core/textrenderer/qgstextformat.cpp
Expand Up @@ -963,7 +963,7 @@ QPixmap QgsTextFormat::textFormatPreviewPixmap( const QgsTextFormat &format, QSi
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
const double logicalDpiX = QgsApplication::desktop()->logicalDpiX();
#else
const double logicalDpiX = QApplication::topLevelWidgets().first()->screen()->devicePixelRatio();
const double logicalDpiX = QApplication::topLevelWidgets().first()->screen()->logicalDotsPerInchX();
#endif
context.setScaleFactor( logicalDpiX / 25.4 );

Expand Down

0 comments on commit 2a1ab9b

Please sign in to comment.