1 files changed, 30 insertions, 5 deletions
diff --git a/src/core/desktop_screen_qt.cpp b/src/core/desktop_screen_qt.cpp
index 9d4bc71e2..fb68f7b09 100644
--- a/src/core/desktop_screen_qt.cpp
+++ b/src/core/desktop_screen_qt.cpp
@@ -42,12 +42,21 @@ display::Display toDisplayDisplay(int id, const QScreen *screen)
 {
     auto display = display::Display(id, toGfx(screen->geometry()));
     display.set_work_area(toGfx(screen->availableGeometry()));
-    display.set_device_scale_factor(screen->devicePixelRatio());
     display.set_is_monochrome(screen->depth() == 1);
     display.set_color_depth(screen->depth());
     display.set_depth_per_component(8); // FIXME: find the real value
     display.set_display_frequency(std::ceil(screen->refreshRate()));
     display.set_rotation(toDisplayRotation(screen->orientation()));
+
+    // FIXME: support lower scale factor
+    float pixelRatio = screen->devicePixelRatio();
+    if (pixelRatio < 1) {
+        qWarning("Unsupported scale factor (%f) detected on Display%d", pixelRatio, id);
+        display.set_device_scale_factor(qGuiApp->devicePixelRatio());
+    } else {
+        display.set_device_scale_factor(pixelRatio);
+    }
+
     if (screen->nativeOrientation() != Qt::PrimaryOrientation)
         display.set_panel_rotation(toDisplayRotation(screen->nativeOrientation()));
     return display;
@@ -60,7 +69,7 @@ DesktopScreenQt::DesktopScreenQt()
 
 DesktopScreenQt::~DesktopScreenQt()
 {
-    for (auto conn : qAsConst(m_connections))
+    for (auto conn : std::as_const(m_connections))
         QObject::disconnect(conn);
 }
 
@@ -110,14 +119,30 @@ display::Display DesktopScreenQt::GetDisplayNearestWindow(gfx::NativeWindow /*wi
     return GetPrimaryDisplay();
 }
 
-bool DesktopScreenQt::SetScreenSaverSuspended(bool suspend)
+#if defined(USE_XSCREENSAVER)
+class XScreenSuspender : public display::Screen::ScreenSaverSuspender
+{
+public:
+    XScreenSuspender()
+    {
+        ui::SuspendX11ScreenSaver(true);
+    }
+    ~XScreenSuspender() override
+    {
+        ui::SuspendX11ScreenSaver(false);
+    }
+};
+#endif
+#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
+std::unique_ptr<display::Screen::ScreenSaverSuspender> DesktopScreenQt::SuspendScreenSaver()
 {
 #if defined(USE_XSCREENSAVER)
-    return ui::SuspendX11ScreenSaver(suspend);
+    return std::make_unique<XScreenSuspender>();
 #else
-    return false;
+    return nullptr;
 #endif
 }
+#endif
 
 bool DesktopScreenQt::IsScreenSaverActive() const
 {