Skip to content

(fix) adjust menubar hotkey detection (Alt) for Qt 6.9 #15352

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: 2.5
Choose a base branch
from
Open

(fix) adjust menubar hotkey detection (Alt) for Qt 6.9 #15352

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/controllers/keyboard/keyboardeventfilter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,10 @@ bool KeyboardEventFilter::eventFilter(QObject*, QEvent* e) {
#ifndef __APPLE__
} else {
// getKeySeq() returns empty string if the press was a modifier only
if ((ke->modifiers() & Qt::AltModifier) && !m_altPressedWithoutKey) {
// on Linux pressing Alt sends Alt+Qt::Key_Alt, so checking for
// Alt modifier is sufficient.
// Activate this in case there are issues on Windows
// || ke->key() == Qt::Key_Alt) {
// On most system Alt sends Alt + Qt::Key_Alt, but with Qt 6.9 (on Linux)
// this changed apparently so that it's just Qt::Key_Alt
if (((ke->modifiers() & Qt::AltModifier) || ke->key() == Qt::Key_Alt) &&
!m_altPressedWithoutKey) {
m_altPressedWithoutKey = true;
}
#endif
Expand Down
Loading