From f872a6ecb4f173540260b559aef1b864e416ae0c Mon Sep 17 00:00:00 2001
From: deepin-ci-robot <packages@deepin.org>
Date: Mon, 14 Sep 2026 11:13:30 +0000
Subject: [PATCH] sync: from linuxdeepin/dde-session-shell

Synchronize source files from linuxdeepin/dde-session-shell.

Source-pull-request: https://github.com/linuxdeepin/dde-session-shell/pull/92
---
 src/app/greeter-display-setting.cpp | 6 +++++-
 src/global_util/public_func.cpp     | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/app/greeter-display-setting.cpp b/src/app/greeter-display-setting.cpp
index 56a32f85..6ba3d3ce 100644
--- a/src/app/greeter-display-setting.cpp
+++ b/src/app/greeter-display-setting.cpp
@@ -280,7 +280,11 @@ double getScaleFormConfig()
 static void setQtScaleFactorEnv() {
     double scaleFactor = 0.0;
 #ifdef ENABLE_DSS_SNIPE
-    scaleFactor = getScaleFactor();
+    if (isScaleConfigExists()) {
+        scaleFactor = getScaleFormConfig();
+    } else {
+        scaleFactor = getScaleFactor();
+    }
 #else
     scaleFactor = IsWayland ? getScaleFormConfig() : getScaleFactor();
 #endif
diff --git a/src/global_util/public_func.cpp b/src/global_util/public_func.cpp
index dbddc5d9..940af1ed 100644
--- a/src/global_util/public_func.cpp
+++ b/src/global_util/public_func.cpp
@@ -94,7 +94,8 @@ int setRootWindowCursor() {
 
     Cursor cursor = static_cast<Cursor>(XcursorFilenameLoadCursor(display, cursorPath));
     if (cursor == 0) {
-        cursor = static_cast<Cursor>(loadCursorHandle(display, "watch", 24));
+        int cursorSize = static_cast<int>(24 * qApp->devicePixelRatio());
+        cursor = static_cast<Cursor>(loadCursorHandle(display, "watch", cursorSize));
     }
     XDefineCursor(display, XDefaultRootWindow(display),cursor);