From 8b31db843c43dca4c9ade903bfafb49081080657 Mon Sep 17 00:00:00 2001 From: uniartisan Date: Fri, 23 Dec 2022 13:59:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20Wayland=20=E5=9C=A8=E6=9F=90=E4=BA=9B?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E4=B8=8B=E9=94=99=E8=AF=AF=E8=AF=86=E5=88=AB?= =?UTF-8?q?=E4=B8=BA=20dde?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 8e053a9..640b49f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -20,9 +20,11 @@ int main(int argc, char *argv[]) static const QTime buildTime = QTime::fromString(__TIME__, "hh:mm:ss"); // 设置桌面环境环境变量 + bool isDeepinOS = true; if (!QString(qgetenv("XDG_CURRENT_DESKTOP")).toLower().startsWith("deepin")) { setenv("XDG_CURRENT_DESKTOP", "Deepin", 1); + isDeepinOS = false; } bool isWayland = false; auto e = QProcessEnvironment::systemEnvironment(); @@ -34,11 +36,12 @@ int main(int argc, char *argv[]) } qDebug() << "Wayland enabled:" << isWayland; - if (isWayland && !Dtk::Core::DSysInfo::isDDE()) + // Set display backend + if (isWayland && useWayland && !(Dtk::Core::DSysInfo::isDDE() || isDeepinOS)) { qputenv("QT_QPA_PLATFORM", "wayland"); } - else if (isWayland && Dtk::Core::DSysInfo::isDDE()) + else if (isWayland && useWayland && (Dtk::Core::DSysInfo::isDDE() && isDeepinOS)) { qputenv("QT_QPA_PLATFORM", "dwayland"); }