Merge pull request musescore#17759 from laarmen/default-dpi-broken-sc…

…reens uiconfiguration: fix DPI for bad screen metadata
codecruisedor · Jul 6, 2023 · 2f0cc6f · 2f0cc6f
2 parents 9bc47d3 + 886ca9e
commit 2f0cc6f
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/framework/ui/internal/uiconfiguration.cpp b/src/framework/ui/internal/uiconfiguration.cpp
@@ -648,9 +648,16 @@ double UiConfiguration::physicalDpi() const
         return m_customDPI.value();
     }
 
+    constexpr double DEFAULT_DPI = 96;
     const QScreen* screen = mainWindow() ? mainWindow()->screen() : nullptr;
     if (!screen) {
-        constexpr double DEFAULT_DPI = 96;
+        return DEFAULT_DPI;
+    }
+
+    auto physicalSize = screen->physicalSize();
+    // Work around xrandr reporting a 1x1mm size if
+    // the screen doesn't have a valid physical size
+    if (physicalSize.height() <= 1 && physicalSize.width() <= 1) {
         return DEFAULT_DPI;
     }