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

Qt: ignore Qt::Key_unknown when parsing key sequences

This commit is contained in:
Megamouse 2023-07-12 04:30:26 +02:00 committed by Elad Ashkenazi
parent eee7bf0c97
commit d153e977a7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rpcs3/Input/keyboard_pad_handler.cpp
View File

@ -317,7 +317,7 @@ void keyboard_pad_handler::processKeyEvent(QKeyEvent* event, bool pressed)
return;
}
auto handle_key = [this, pressed, event]()
const auto handle_key = [this, pressed, event]()
{
QStringList list = GetKeyNames(event);
if (list.isEmpty())
@ -332,7 +332,7 @@ void keyboard_pad_handler::processKeyEvent(QKeyEvent* event, bool pressed)
// TODO: Edge case: switching numlock keeps numpad keys pressed due to now different modifier
// Handle every possible key combination, for example: ctrl+A -> {ctrl, A, ctrl+A}
for (const auto& keyname : list)
for (const QString& keyname : list)
{
// skip the 'original keys' when handling numpad keys
if (is_num_key && !keyname.contains("Num"))
@ -807,7 +807,7 @@ u32 keyboard_pad_handler::GetKeyCode(const QString& keyName)
const QKeySequence seq(keyName);
u32 key_code = Qt::NoButton;
if (seq.count() == 1)
if (seq.count() == 1 && seq[0] != Qt::Key_unknown)
key_code = seq[0];
else
input_log.notice("GetKeyCode(%s): seq.count() = %d", keyName, seq.count());
@ -907,7 +907,7 @@ bool keyboard_pad_handler::bindPadToDevice(std::shared_ptr<Pad> pad, u8 player_i
u32 pclass_profile = 0x0;
for (const auto& product : input::get_products_by_class(cfg->device_class_type))
for (const input::product_info& product : input::get_products_by_class(cfg->device_class_type))
{
if (product.vendor_id == cfg->vendor_id && product.product_id == cfg->product_id)
{