fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2026-03-27 10:29:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix XDG desktop check

Browse Source
This commit is contained in:
nullobsi
2021-03-04 19:42:11 -08:00
committed by borgmanJeremy
parent 743f17dd2e
commit 31f997aceb
2 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main.cpp
View File

@@ -25,6 +25,7 @@
#include "src/utils/dbusutils.h"
#include <QDBusConnection>
#include <QDBusMessage>
#include <desktopinfo.h>
#endif
int waitAfterConnecting(int delay, QCoreApplication& app)
@@ -41,11 +42,8 @@ int waitAfterConnecting(int delay, QCoreApplication& app)
void wayland_hacks()
{
// Workaround to https://github.com/ksnip/ksnip/issues/416
QByteArray currentDesktop = qgetenv("XDG_CURRENT_DESKTOP").toLower();
QByteArray sessionDesktop = qgetenv("XDG_SESSION_DESKTOP").toLower();
QByteArray sessionType = qgetenv("XDG_SESSION_TYPE").toLower();
if (sessionType.contains("wayland") && (currentDesktop.contains("gnome") ||
sessionDesktop.contains("gnome"))) {
DesktopInfo info;
if (info.windowManager() == DesktopInfo::GNOME) {
qputenv("QT_QPA_PLATFORM", "xcb");
}
}

30
src/utils/desktopinfo.cpp
View File

@@ -26,16 +26,26 @@ bool DesktopInfo::waylandDectected()
DesktopInfo::WM DesktopInfo::windowManager()
{
DesktopInfo::WM res = DesktopInfo::OTHER;
if (XDG_CURRENT_DESKTOP.contains(QLatin1String("GNOME"),
Qt::CaseInsensitive) ||
!GNOME_DESKTOP_SESSION_ID.isEmpty()) {
res = DesktopInfo::GNOME;
} else if (XDG_CURRENT_DESKTOP.contains(QLatin1String("sway"),
Qt::CaseInsensitive)) {
res = DesktopInfo::SWAY;
} else if (!KDE_FULL_SESSION.isEmpty() ||
DESKTOP_SESSION == QLatin1String("kde-plasma")) {
res = DesktopInfo::KDE;
QStringList desktops = XDG_CURRENT_DESKTOP.split(QChar(':'));
for (auto & desktop : desktops) {
if (desktop.contains(QLatin1String("GNOME"),Qt::CaseInsensitive)) {
return DesktopInfo::GNOME;
}
if (desktop.contains(QLatin1String("sway"),Qt::CaseInsensitive)) {
return DesktopInfo::SWAY;
}
if (desktop.contains(QLatin1String("kde-plasma"))) {
return DesktopInfo::KDE;
}
}
if (!GNOME_DESKTOP_SESSION_ID.isEmpty()) {
return DesktopInfo::GNOME;
}
if (!KDE_FULL_SESSION.isEmpty()) {
return DesktopInfo::KDE;
}
return res;
}