spark-store-project/spark-store
15
0
Fork 0
mirror of https://gitee.com/spark-store-project/spark-store synced 2025-09-29 07:02:20 +08:00
Code Issues 1 Packages Projects Releases Wiki Activity

fix: Wayland 在某些环境下错误识别为 dde

Browse Source
This commit is contained in:
uniartisan 2022-12-23 13:59:17 +08:00
parent fd4fdbe970
commit 8b31db843c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main.cpp
View File

@ -20,9 +20,11 @@ int main(int argc, char *argv[])
static const QTime buildTime = QTime::fromString(__TIME__, "hh:mm:ss"); static const QTime buildTime = QTime::fromString(__TIME__, "hh:mm:ss");
// 设置桌面环境环境变量 // 设置桌面环境环境变量
bool isDeepinOS = true;
if (!QString(qgetenv("XDG_CURRENT_DESKTOP")).toLower().startsWith("deepin")) if (!QString(qgetenv("XDG_CURRENT_DESKTOP")).toLower().startsWith("deepin"))
{ {
setenv("XDG_CURRENT_DESKTOP", "Deepin", 1); setenv("XDG_CURRENT_DESKTOP", "Deepin", 1);
isDeepinOS = false;
} }
bool isWayland = false; bool isWayland = false;
auto e = QProcessEnvironment::systemEnvironment(); auto e = QProcessEnvironment::systemEnvironment();
@ -34,11 +36,12 @@ int main(int argc, char *argv[])
} }
qDebug() << "Wayland enabled:" << isWayland; 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"); 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"); qputenv("QT_QPA_PLATFORM", "dwayland");
} }