mirror of https://github.com/RPCS3/rpcs3.git
Qt/Input: update keyboard_pad_handler shortcuts
This is just some patchwork before the shortcuts get refactored eventually
This commit is contained in:
parent
1f25924384
commit
bec6bde919
|
@ -217,9 +217,11 @@ void keyboard_pad_handler::processKeyEvent(QKeyEvent* event, bool pressed)
|
|||
};
|
||||
|
||||
// We need to ignore keys when using rpcs3 keyboard shortcuts
|
||||
// NOTE: needs to be updated with gs_frame::keyPressEvent
|
||||
switch (event->key())
|
||||
{
|
||||
case Qt::Key_Escape:
|
||||
case Qt::Key_F12:
|
||||
break;
|
||||
case Qt::Key_L:
|
||||
case Qt::Key_Return:
|
||||
|
|
|
@ -116,6 +116,8 @@ void gs_frame::showEvent(QShowEvent *event)
|
|||
|
||||
void gs_frame::keyPressEvent(QKeyEvent *keyEvent)
|
||||
{
|
||||
// NOTE: needs to be updated with keyboard_pad_handler::processKeyEvent
|
||||
|
||||
switch (keyEvent->key())
|
||||
{
|
||||
case Qt::Key_L:
|
||||
|
|
|
@ -413,7 +413,7 @@ void pad_settings_dialog::InitButtons()
|
|||
// Use timer to get button input
|
||||
connect(&m_timer_input, &QTimer::timeout, [this, callback, fail_callback]()
|
||||
{
|
||||
std::vector<std::string> buttons =
|
||||
const std::vector<std::string> buttons =
|
||||
{
|
||||
m_cfg_entries[button_ids::id_pad_l2].key, m_cfg_entries[button_ids::id_pad_r2].key, m_cfg_entries[button_ids::id_pad_lstick_left].key,
|
||||
m_cfg_entries[button_ids::id_pad_lstick_right].key, m_cfg_entries[button_ids::id_pad_lstick_down].key, m_cfg_entries[button_ids::id_pad_lstick_up].key,
|
||||
|
@ -443,7 +443,7 @@ void pad_settings_dialog::InitButtons()
|
|||
|
||||
void pad_settings_dialog::SetPadData(u32 large_motor, u32 small_motor)
|
||||
{
|
||||
QColor led_color(m_handler_cfg.colorR, m_handler_cfg.colorG, m_handler_cfg.colorB);
|
||||
const QColor led_color(m_handler_cfg.colorR, m_handler_cfg.colorG, m_handler_cfg.colorB);
|
||||
m_handler->SetPadData(m_device_name, large_motor, small_motor, led_color.red(), led_color.green(), led_color.blue(), static_cast<bool>(m_handler_cfg.led_battery_indicator), m_handler_cfg.led_battery_indicator_brightness);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue