spark-store-project/spark-store
15
0
Fork 0
mirror of https://gitee.com/spark-store-project/spark-store synced 2025-09-23 11:32:21 +08:00
Code Issues 1 Packages Projects Releases Wiki Activity

fix: 修改 treeland 环境判断条件

Browse Source 
修改读取的环境变量名称为 DDE_CURRENT_COMPOSITOR，避免后续修改造成的不兼容问题

Log: 修改 treeland 环境判断条件；去除 dwayland 平台插件调用
This commit is contained in:
zty199 2024-02-03 20:25:51 +08:00
parent 37057306bb
commit e9a52da098
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/utils/utils.cpp
View File

@ -80,8 +80,7 @@ bool Utils::isWayland()
bool Utils::isTreeLand() bool Utils::isTreeLand()
{ {
bool isTreeLand = false; bool isTreeLand = false;
if (qgetenv("DDE_CURRENT_COMPOSITER").toLower() == "treeland" if (qgetenv("DDE_CURRENT_COMPOSITOR").toLower() == "treeland") {
|| qgetenv("DESKTOP_SESSION").toLower() == "treeland") {
isTreeLand = true; isTreeLand = true;
} }
@ -185,14 +184,18 @@ void Utils::setQPAPlatform()
qDebug() << "System Wayland enabled:" << isWayland << "Spark Wayland enabled:" << useWayland; qDebug() << "System Wayland enabled:" << isWayland << "Spark Wayland enabled:" << useWayland;
if (isWayland && useWayland && !(Dtk::Core::DSysInfo::isDeepin() || isDDE)) /**
* NOTE: https://github.com/linuxdeepin/developer-center/issues/7217#issuecomment-1922653903
* DDE Wayland has been deprecated, so using wayland plugin only
*/
if (isWayland && useWayland /*&& !(Dtk::Core::DSysInfo::isDeepin() || isDDE)*/)
{ {
qputenv("QT_QPA_PLATFORM", "wayland"); qputenv("QT_QPA_PLATFORM", "wayland");
} }
else if (isWayland && useWayland && (Dtk::Core::DSysInfo::isDeepin() && isDDE)) // else if (isWayland && useWayland && (Dtk::Core::DSysInfo::isDeepin() && isDDE))
{ // {
qputenv("QT_QPA_PLATFORM", "dwayland"); // qputenv("QT_QPA_PLATFORM", "dwayland");
} // }
else else
{ {
qputenv("QT_QPA_PLATFORM", "dxcb"); qputenv("QT_QPA_PLATFORM", "dxcb");