benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simpler desktop detection code

Browse Source
This commit is contained in:
lupoDharkael
2017-12-24 00:00:05 +01:00
parent 67297f1fe7
commit b162101cd8
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/utils/desktopinfo.cpp
View File

@@ -26,25 +26,21 @@ DesktopInfo::DesktopInfo()
WAYLAND_DISPLAY = e.value("WAYLAND_DISPLAY");
KDE_FULL_SESSION = e.value("KDE_FULL_SESSION");
GNOME_DESKTOP_SESSION_ID = e.value("GNOME_DESKTOP_SESSION_ID");
GDMSESSION = e.value("GDMSESSION");
DESKTOP_SESSION = e.value("DESKTOP_SESSION");
}
bool DesktopInfo::waylandDectected() {
return XDG_SESSION_TYPE == "wayland" || WAYLAND_DISPLAY.contains("wayland");
return XDG_SESSION_TYPE == "wayland" ||
WAYLAND_DISPLAY.contains("wayland", Qt::CaseInsensitive);
}
DesktopInfo::WM DesktopInfo::windowManager() {
DesktopInfo::WM res = DesktopInfo::OTHER;
if (XDG_CURRENT_DESKTOP.contains("GNOME", Qt::CaseInsensitive) ||
!GNOME_DESKTOP_SESSION_ID.isEmpty() ||
QString::compare("GNOME", GDMSESSION, Qt::CaseInsensitive) == 0 ||
GDMSESSION == "gnome-shell" ||
GDMSESSION == "gnome-classic" ||
GDMSESSION == "gnome-fallback")
!GNOME_DESKTOP_SESSION_ID.isEmpty())
{
res = DesktopInfo::GNOME;
} else if (KDE_FULL_SESSION == "true" || DESKTOP_SESSION == "kde-plasma") {
} else if (!KDE_FULL_SESSION.isEmpty() || DESKTOP_SESSION == "kde-plasma") {
res = DesktopInfo::KDE;
}
return res;