ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix shortcuts

This commit is contained in:
oltolm 2024-04-30 19:01:52 +02:00 committed by Vicki Pfau
parent 79193b914b
commit a824989e5a
2 changed files with 7 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/platform/qt/KeyEditor.cpp
View File

@ -41,7 +41,7 @@ void KeyEditor::setValue(int key) {
if (m_button) { if (m_button) {
updateButtonText(); updateButtonText();
} else { } else {
if (key < 0) { if (key == Qt::Key_unknown) {
setText(tr("---")); setText(tr("---"));
} else { } else {
setText(keyName(key)); setText(keyName(key));
@ -78,7 +78,7 @@ void KeyEditor::setValueHat(int hat, GamepadHatEvent::Direction direction) {
void KeyEditor::clearButton() { void KeyEditor::clearButton() {
m_button = true; m_button = true;
setValue(-1); setValue(Qt::Key_unknown);
} }
void KeyEditor::clearAxis() { void KeyEditor::clearAxis() {
@ -106,48 +106,11 @@ QSize KeyEditor::sizeHint() const {
void KeyEditor::keyPressEvent(QKeyEvent* event) { void KeyEditor::keyPressEvent(QKeyEvent* event) {
if (!m_button) { if (!m_button) {
if (m_key < 0 || !m_lastKey.isActive()) { if (!m_lastKey.isActive()) {
m_key = 0; m_key = Qt::Key_unknown;
} }
m_lastKey.start(KEY_TIME); m_lastKey.start(KEY_TIME);
if (m_key) { setValue(ShortcutController::isModifierKey(event->key()) ? event->modifiers() : event->key() | event->modifiers());
if (ShortcutController::isModifierKey(m_key)) {
switch (event->key()) {
case Qt::Key_Shift:
setValue(Qt::ShiftModifier);
break;
case Qt::Key_Control:
setValue(Qt::ControlModifier);
break;
case Qt::Key_Alt:
setValue(Qt::AltModifier);
break;
case Qt::Key_Meta:
setValue(Qt::MetaModifier);
break;
}
}
if (ShortcutController::isModifierKey(event->key())) {
switch (event->key()) {
case Qt::Key_Shift:
setValue(m_key | Qt::ShiftModifier);
break;
case Qt::Key_Control:
setValue(m_key | Qt::ControlModifier);
break;
case Qt::Key_Alt:
setValue(m_key | Qt::AltModifier);
break;
case Qt::Key_Meta:
setValue(m_key | Qt::MetaModifier);
break;
}
} else {
setValue(event->key() | (m_key & (Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier | Qt::MetaModifier)));
}
} else {
setValue(event->key());
}
} }
event->accept(); event->accept();
} }
@ -213,7 +176,7 @@ void KeyEditor::updateButtonText() {
break; break;
} }
} }
if (m_key >= 0) { if (m_key != Qt::Key_unknown) {
std::shared_ptr<Gamepad> gamepad; std::shared_ptr<Gamepad> gamepad;
if (m_controller && m_controller->gamepadDriver()) { if (m_controller && m_controller->gamepadDriver()) {
gamepad = m_controller->gamepadDriver()->activeGamepad(); gamepad = m_controller->gamepadDriver()->activeGamepad();

2
src/platform/qt/KeyEditor.h
View File

@ -57,7 +57,7 @@ private:
void updateButtonText(); void updateButtonText();
int m_key = -1; int m_key = Qt::Key_unknown;
int m_axis = -1; int m_axis = -1;
int m_hat = -1; int m_hat = -1;
bool m_button = false; bool m_button = false;