diff options
author | Robert Adam <dev@robert-adam.de> | 2022-05-18 09:51:13 +0300 |
---|---|---|
committer | Robert Adam <dev@robert-adam.de> | 2022-07-31 18:31:52 +0300 |
commit | 49cc697c07e71c86484e3594fbb961a11787abcd (patch) | |
tree | 48fb2f83b95e0073a1bef5454cee27b43dc998a6 | |
parent | 0b7d5f3f391cae6389a577af0ff0df3a3745fb6b (diff) |
CHANGE(client): Don't hard block shortcuts on Wayland
In #5307 we disabled global shortcuts on Wayland, but we did it in a way
that would prevent anyone from re-enabling the support.
Since we have received reports of some users actually making use of the
shortcut system on Wayland, even without proper Wayland support, we
decided to remove the hard-lock and allow these users to re-enable the
shortcuts, if they so want.
Fixes #5454
-rw-r--r-- | src/mumble/GlobalShortcut.cpp | 2 | ||||
-rw-r--r-- | src/mumble/GlobalShortcut.ui | 2 | ||||
-rw-r--r-- | src/mumble/GlobalShortcut_unix.cpp | 7 | ||||
-rw-r--r-- | src/mumble/Settings.cpp | 8 |
4 files changed, 2 insertions, 17 deletions
diff --git a/src/mumble/GlobalShortcut.cpp b/src/mumble/GlobalShortcut.cpp index 5f5155e39..23fe3a02b 100644 --- a/src/mumble/GlobalShortcut.cpp +++ b/src/mumble/GlobalShortcut.cpp @@ -532,8 +532,6 @@ GlobalShortcutConfig::GlobalShortcutConfig(Settings &st) : ConfigWidget(st) { if (EnvUtils::waylandIsUsed()) { // Our global shortcut system doesn't work with Wayland qlWaylandNote->setVisible(true); - - qgbShortcuts->setEnabled(false); } #endif diff --git a/src/mumble/GlobalShortcut.ui b/src/mumble/GlobalShortcut.ui index af65a45c1..55faa57fa 100644 --- a/src/mumble/GlobalShortcut.ui +++ b/src/mumble/GlobalShortcut.ui @@ -98,7 +98,7 @@ <item> <widget class="QLabel" name="qlWaylandNote"> <property name="text"> - <string><html><head/><body><p>Mumble's Global Shortcuts system does currently not work in combination with the Wayland protocol. For more information, visit <a href="https://github.com/mumble-voip/mumble/issues/5257"><span style=" text-decoration: underline; color:#0057ae;">https://github.com/mumble-voip/mumble/issues/5257</span></a>.</p></body></html></string> + <string><html><head/><body><p>Mumble's Global Shortcuts system does currently not work properly in combination with the Wayland protocol. For more information, visit <a href="https://github.com/mumble-voip/mumble/issues/5257"><span style=" text-decoration: underline; color:#0057ae;">https://github.com/mumble-voip/mumble/issues/5257</span></a>.</p></body></html></string> </property> <property name="wordWrap"> <bool>true</bool> diff --git a/src/mumble/GlobalShortcut_unix.cpp b/src/mumble/GlobalShortcut_unix.cpp index d89bbb139..2d3351cae 100644 --- a/src/mumble/GlobalShortcut_unix.cpp +++ b/src/mumble/GlobalShortcut_unix.cpp @@ -5,7 +5,6 @@ #include "GlobalShortcut_unix.h" -#include "EnvUtils.h" #include "Settings.h" #include "Global.h" @@ -63,12 +62,6 @@ GlobalShortcutX::GlobalShortcutX() { } #ifdef Q_OS_LINUX - if (EnvUtils::waylandIsUsed()) { - qWarning("GlobalShortcutX: Global shortcuts don't work on Wayland (see " - "https://github.com/mumble-voip/mumble/issues/5257)"); - return; - } - if (Global::get().s.bEnableEvdev) { QString dir = QLatin1String("/dev/input"); QFileSystemWatcher *fsw = new QFileSystemWatcher(QStringList(dir), this); diff --git a/src/mumble/Settings.cpp b/src/mumble/Settings.cpp index 947b5d398..09b5aff75 100644 --- a/src/mumble/Settings.cpp +++ b/src/mumble/Settings.cpp @@ -530,6 +530,7 @@ Settings::Settings() { #ifdef Q_OS_LINUX if (EnvUtils::waylandIsUsed()) { + // Due to the issues we're currently having on Wayland, we disable shortcuts by default bShortcutEnable = false; } #endif @@ -1025,13 +1026,6 @@ void Settings::legacyLoad(const QString &path) { LOAD(bEnableXboxInput, "shortcut/windows/xbox/enable"); LOAD(bEnableUIAccess, "shortcut/windows/uiaccess/enable"); -#ifdef Q_OS_LINUX - if (EnvUtils::waylandIsUsed()) { - // Global shortcuts don't work on Wayland - bShortcutEnable = false; - } -#endif - // Search options LOAD(searchForUsers, "search/search_for_users"); LOAD(searchForChannels, "search/search_for_channels"); |