Backport "Merge PR #5688: CHANGE(client): Don't hard block shortcuts on Wayland" to 1.4.x #5785
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 task
In mumble-voip#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 mumble-voip#5454 (cherry picked from commit 49cc697)
Previously the shortcut engine on Unix could not be disabled. Therefore, the bEnableShortcut setting effectively had no effect on these systems, making the change of its default value on Wayland (in order to prevent CPU intensive polling) as done in 13c7ff5 pointless. This commit extends the engine's implementation such that it is now able to disable shortcuts. This will automatically expose the enable shortcut setting in the settings page. Thus, users can now explicitly re-enabled the shortcut engine on Wayland systems. (cherry picked from commit 5d09f45)
29ac525 to
ad4e122
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport
This will backport the following commits from
masterto1.4.x:Questions ?
Please refer to the Backport tool documentation