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.

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

4.5.0 ports #26974

Merged
merged 9 commits into from
Mar 7, 2025
Merged

4.5.0 ports #26974

merged 9 commits into from
Mar 7, 2025

Conversation

cbjeukendrup and others added 9 commits March 7, 2025 18:03
Resolves: musescore#25824

When using Russian keyboard layout, and when there is a `Z` shortcut and a `Ctrl+Z` shortcut, and you press `Ctrl+Z`, we add four shortcuts:
- `Z` and `Я`
- `Ctrl+Z` and `Ctrl+Я`

When pressing `Ctrl+Z`, Qt thinks there are two possible keys:
```
17:42:43.971 | DEBUG | main_thread     | Qt              | 	- QKeyCombination(ControlModifier, Key(1071)) / QKeySequence("Ctrl+Я") / ⌘Я
17:42:43.971 | DEBUG | main_thread     | Qt              | 	- QKeyCombination(NoModifier, Key_Z) / QKeySequence("Z") / Z
```
(output seen after `QLoggingCategory::setFilterRules("qt.gui.shortcutmap.debug=true\nqt.qpa.keymapper.debug=true\nqt.qpa.keymapper.keys.debug=true");`)

The latter, `Z` with no modifier, makes no sense to me, but whatever; Qt thinks it must be.

As a result, Qt thinks the shortcuts are ambiguous: it doesn't know whether to activate `Z` or `Ctrl+Я`.

The solution is to avoid adding `Z` as a shortcut; it won't be necessary anyway, as `Я` suffices.

Same story goes for other single-letter shortcuts.
Addresses musescore#26774 (comment). Apparently the issue with ambiguous keys doesn't apply to the A key. It is totally unclear why. The possibility that there are other keys to which this applies too, has not been ruled out.
…thod

selectAndStartEditIfNeeded checks the previous selection and the new selection and if it is different then it finishes editing the previous selection so we don't need to change the selection in cmdPaste
1. react to percussionPanelAutoShowModeChanged()
2. ensure we don't dispatch "set-dock-open" multiple times in succession
Undo may cause the part to be destroyed, so we want to hold the pointer until it completes
@RomanPudashkin
Copy link
Contributor

Thank you!

@RomanPudashkin RomanPudashkin merged commit e138427 into musescore:4.5.0 Mar 7, 2025
11 checks passed
@Jojo-Schmitz Jojo-Schmitz deleted the 4.5.0-ports branch March 7, 2025 17:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants