diff --git a/deepin-system-monitor-main/3rdparty/dmidecode/dmioem.c b/deepin-system-monitor-main/3rdparty/dmidecode/dmioem.c index 3cdfdeab..118c1d65 100644 --- a/deepin-system-monitor-main/3rdparty/dmidecode/dmioem.c +++ b/deepin-system-monitor-main/3rdparty/dmidecode/dmioem.c @@ -24,6 +24,7 @@ #include "types.h" #include "util.h" +#include "lscpu.h" #include "dmidecode.h" #include "dmioem.h" #include "dmiopt.h" diff --git a/deepin-system-monitor-main/common/common.cpp b/deepin-system-monitor-main/common/common.cpp index c8780794..c05ce722 100644 --- a/deepin-system-monitor-main/common/common.cpp +++ b/deepin-system-monitor-main/common/common.cpp @@ -209,7 +209,7 @@ void WaylandSearchCentered() if (XDG_SESSION_TYPE == QLatin1String("wayland") || WAYLAND_DISPLAY.contains(QLatin1String("wayland"), Qt::CaseInsensitive)) { WaylandCentered = true; - if (!common::systemInfo().isOldVersion()) + if (!common::systemInfo().isOldVersion() && !common::systemInfo().isTreeLand()) qputenv("QT_WAYLAND_SHELL_INTEGRATION", "kwayland-shell"); } else { WaylandCentered = false; diff --git a/helper.hpp b/helper.hpp index 7e853800..0e74c641 100644 --- a/helper.hpp +++ b/helper.hpp @@ -47,6 +47,10 @@ class SystemState { QString DOCK_PATH; QString DOCK_INTERFACE; + inline bool isTreeLand() const + { + return qEnvironmentVariable("DDE_CURRENT_COMPOSITOR") == "TreeLand"; + } inline bool isOldVersion() const { return m_isOldVersion;