mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-08-09 17:49:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Qt: use shift+click to append the button instead of replacing it

Browse source
This commit is contained in:
Megamouse 2023-06-15 20:18:12 +02:00
commit 924692bf1c
2 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

29
rpcs3/rpcs3qt/pad_settings_dialog.cpp
View file

@ -53,9 +53,13 @@ inline bool CreateConfigFile(const QString& dir, const QString& name)
return true; return true;
} }
void pad_settings_dialog::pad_button::insert_key(const std::string& key) void pad_settings_dialog::pad_button::insert_key(const std::string& key, bool append_key)
{ {
std::vector<std::string> buttons = cfg_pad::get_buttons(keys); std::vector<std::string> buttons;
if (append_key)
{
buttons = cfg_pad::get_buttons(keys);
}
buttons.push_back(key); buttons.push_back(key);
keys = cfg_pad::get_buttons(std::move(buttons)); keys = cfg_pad::get_buttons(std::move(buttons));
@ -458,7 +462,7 @@ void pad_settings_dialog::InitButtons()
if (m_button_id > button_ids::id_pad_begin && m_button_id < button_ids::id_pad_end) if (m_button_id > button_ids::id_pad_begin && m_button_id < button_ids::id_pad_end)
{ {
m_cfg_entries[m_button_id].insert_key(name); m_cfg_entries[m_button_id].insert_key(name, m_enable_multi_binding);
ReactivateButtons(); ReactivateButtons();
} }
}; };
@ -709,6 +713,7 @@ void pad_settings_dialog::ReactivateButtons()
{ {
m_remap_timer.stop(); m_remap_timer.stop();
m_seconds = MAX_SECONDS; m_seconds = MAX_SECONDS;
m_enable_multi_binding = false;
if (m_button_id == button_ids::id_pad_begin) if (m_button_id == button_ids::id_pad_begin)
{ {
@ -763,8 +768,8 @@ void pad_settings_dialog::RepaintPreviewLabel(QLabel* l, int deadzone, int desir
const bool show_emulated_values = ui->chb_show_emulated_values->isChecked(); const bool show_emulated_values = ui->chb_show_emulated_values->isChecked();
[[maybe_unused]] qreal ingame_x = 0.0; qreal ingame_x = 0.0;
[[maybe_unused]] qreal ingame_y = 0.0; qreal ingame_y = 0.0;
// Set up the canvas for our work of art // Set up the canvas for our work of art
QPixmap pixmap(scaled_width, scaled_width); QPixmap pixmap(scaled_width, scaled_width);
@ -852,7 +857,7 @@ void pad_settings_dialog::keyPressEvent(QKeyEvent *keyEvent)
} }
else else
{ {
m_cfg_entries[m_button_id].insert_key(keyboard_pad_handler::GetKeyName(keyEvent)); m_cfg_entries[m_button_id].insert_key(keyboard_pad_handler::GetKeyName(keyEvent), m_enable_multi_binding);
} }
ReactivateButtons(); ReactivateButtons();
@ -879,7 +884,7 @@ void pad_settings_dialog::mouseReleaseEvent(QMouseEvent* event)
} }
else else
{ {
m_cfg_entries[m_button_id].insert_key((static_cast<keyboard_pad_handler*>(m_handler.get()))->GetMouseName(event)); m_cfg_entries[m_button_id].insert_key((static_cast<keyboard_pad_handler*>(m_handler.get()))->GetMouseName(event), m_enable_multi_binding);
} }
ReactivateButtons(); ReactivateButtons();
@ -941,7 +946,7 @@ void pad_settings_dialog::wheelEvent(QWheelEvent *event)
} }
} }
m_cfg_entries[m_button_id].insert_key((static_cast<keyboard_pad_handler*>(m_handler.get()))->GetMouseName(key)); m_cfg_entries[m_button_id].insert_key((static_cast<keyboard_pad_handler*>(m_handler.get()))->GetMouseName(key), m_enable_multi_binding);
ReactivateButtons(); ReactivateButtons();
} }
@ -991,7 +996,7 @@ void pad_settings_dialog::mouseMoveEvent(QMouseEvent* event)
if (key != 0) if (key != 0)
{ {
m_cfg_entries[m_button_id].insert_key((static_cast<keyboard_pad_handler*>(m_handler.get()))->GetMouseName(key)); m_cfg_entries[m_button_id].insert_key((static_cast<keyboard_pad_handler*>(m_handler.get()))->GetMouseName(key), m_enable_multi_binding);
ReactivateButtons(); ReactivateButtons();
} }
} }
@ -1251,6 +1256,12 @@ void pad_settings_dialog::OnPadButtonClicked(int id)
break; break;
} }
// On shift+click or shift+space enable multi key binding
if (QApplication::keyboardModifiers() & Qt::KeyboardModifier::ShiftModifier)
{
m_enable_multi_binding = true;
}
for (auto but : m_pad_buttons->buttons()) for (auto but : m_pad_buttons->buttons())
{ {
but->setFocusPolicy(Qt::ClickFocus); but->setFocusPolicy(Qt::ClickFocus);

5
rpcs3/rpcs3qt/pad_settings_dialog.h
View file

@ -83,7 +83,7 @@ class pad_settings_dialog : public QDialog
std::string keys; std::string keys;
QString text; QString text;
void insert_key(const std::string& key); void insert_key(const std::string& key, bool append_key);
}; };
const QString Disconnected_suffix = tr(" (disconnected)"); const QString Disconnected_suffix = tr(" (disconnected)");
@ -152,9 +152,10 @@ private:
int m_last_player_id = 0; int m_last_player_id = 0;
// Remap Timer // Remap Timer
const int MAX_SECONDS = 5; static constexpr int MAX_SECONDS = 5;
int m_seconds = MAX_SECONDS; int m_seconds = MAX_SECONDS;
QTimer m_remap_timer; QTimer m_remap_timer;
bool m_enable_multi_binding = false;
// Mouse Move // Mouse Move
QPoint m_last_pos; QPoint m_last_pos;