Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: systemd monitor treeland adaptation #363

Merged
merged 1 commit into from
Aug 20, 2024
Merged

fix: systemd monitor treeland adaptation #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions deepin-system-monitor-main/3rdparty/dmidecode/dmioem.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

#include "types.h"
#include "util.h"
#include "lscpu.h"
#include "dmidecode.h"
#include "dmioem.h"
#include "dmiopt.h"
Expand Down
2 changes: 1 addition & 1 deletion deepin-system-monitor-main/common/common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions helper.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading