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.

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

Fix "ambiguity" with Russian keyboard layout #26774

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −14
Open

Fix "ambiguity" with Russian keyboard layout #26774

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
30 changes: 16 additions & 14 deletions src/framework/shortcuts/internal/platform/macos/macosshortcutsinstancemodel.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,27 +379,29 @@ static QKeySequence translateToCurrentKeyboardLayout(const QKeySequence& sequenc

// Ensure standard order of modifiers by converting to/from QKeySequence
QKeySequence untranslatedSequence = QKeySequence::fromString(untranslatedSequenceStr, QKeySequence::PortableText);
QString untranslatedSequenceStrNormalised = untranslatedSequence.toString(QKeySequence::PortableText);

// Always record the untranslated sequence
// Map to non-normalised, because that's what ShortcutsInstanceModel::doActivate expects
recordMapping(untranslatedSequenceStrNormalised, untranslatedSequenceStr, true);
recordAutoRepeat(untranslatedSequenceStrNormalised, sc.autoRepeat);

// Attempt to translate from combination of keys to character, e.g., `Shift+.` becomes `>`, in the case of a QWERTY layout
QKeySequence translatedSequence
= translateToCurrentKeyboardLayout(untranslatedSequence);
if (translatedSequence.isEmpty()) {
LOGW() << "Failed to translate sequence " << untranslatedSequenceStr;
continue;
if (translatedSequence.isEmpty() || !(untranslatedSequence[0].key() & 0xff)) {
QString untranslatedSequenceStrNormalised = untranslatedSequence.toString(QKeySequence::PortableText);

// Record the untranslated sequence
// Map to non-normalised, because that's what ShortcutsInstanceModel::doActivate expects
recordMapping(untranslatedSequenceStrNormalised, untranslatedSequenceStr, true);
recordAutoRepeat(untranslatedSequenceStrNormalised, sc.autoRepeat);
}

QString translatedSequenceStrNormalised = translatedSequence.toString(QKeySequence::PortableText);
if (translatedSequence.isEmpty()) {
LOGW() << "Failed to translate sequence " << untranslatedSequenceStr;
} else {
QString translatedSequenceStrNormalised = translatedSequence.toString(QKeySequence::PortableText);

// If it was successful, record the translated sequence too, and map it to the untranslated sequence
// Again, map to non-normalised
recordMapping(translatedSequenceStrNormalised, untranslatedSequenceStr, false);
recordAutoRepeat(translatedSequenceStrNormalised, sc.autoRepeat);
// If it was successful, record the translated sequence too, and map it to the untranslated sequence
// Again, map to non-normalised
recordMapping(translatedSequenceStrNormalised, untranslatedSequenceStr, false);
recordAutoRepeat(translatedSequenceStrNormalised, sc.autoRepeat);
}
}
}

Expand Down
Loading