From 5cc05d082de581331efb7571bf464c075661689c Mon Sep 17 00:00:00 2001 From: Megamouse Date: Wed, 22 May 2024 00:38:27 +0200 Subject: [PATCH] qt: ignore right click to clear input config button if the button is disabled --- rpcs3/rpcs3qt/basic_mouse_settings_dialog.cpp | 2 +- rpcs3/rpcs3qt/pad_settings_dialog.cpp | 2 +- rpcs3/rpcs3qt/raw_mouse_settings_dialog.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rpcs3/rpcs3qt/basic_mouse_settings_dialog.cpp b/rpcs3/rpcs3qt/basic_mouse_settings_dialog.cpp index a96fe1a2c3..f56ec6ec5c 100644 --- a/rpcs3/rpcs3qt/basic_mouse_settings_dialog.cpp +++ b/rpcs3/rpcs3qt/basic_mouse_settings_dialog.cpp @@ -220,7 +220,7 @@ bool basic_mouse_settings_dialog::eventFilter(QObject* object, QEvent* event) if (m_button_id < 0) { QMouseEvent* mouse_event = static_cast(event); - if (const auto button = qobject_cast(object); button && mouse_event->button() == Qt::RightButton) + if (const auto button = qobject_cast(object); button && button->isEnabled() && mouse_event->button() == Qt::RightButton) { if (const int button_id = m_buttons->id(button)) { diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.cpp b/rpcs3/rpcs3qt/pad_settings_dialog.cpp index f3154661e8..2864d1a8b4 100644 --- a/rpcs3/rpcs3qt/pad_settings_dialog.cpp +++ b/rpcs3/rpcs3qt/pad_settings_dialog.cpp @@ -1026,7 +1026,7 @@ bool pad_settings_dialog::eventFilter(QObject* object, QEvent* event) if (m_button_id == button_ids::id_pad_begin) { QMouseEvent* mouse_event = static_cast(event); - if (const auto button = qobject_cast(object); button && mouse_event->button() == Qt::RightButton) + if (const auto button = qobject_cast(object); button && button->isEnabled() && mouse_event->button() == Qt::RightButton) { if (const int button_id = m_pad_buttons->id(button); m_cfg_entries.contains(button_id)) { diff --git a/rpcs3/rpcs3qt/raw_mouse_settings_dialog.cpp b/rpcs3/rpcs3qt/raw_mouse_settings_dialog.cpp index 0d2dc885f2..5d8e45f667 100644 --- a/rpcs3/rpcs3qt/raw_mouse_settings_dialog.cpp +++ b/rpcs3/rpcs3qt/raw_mouse_settings_dialog.cpp @@ -362,7 +362,7 @@ bool raw_mouse_settings_dialog::eventFilter(QObject* object, QEvent* event) if (m_button_id < 0 && !m_disable_mouse_release_event) { QMouseEvent* mouse_event = static_cast(event); - if (const auto button = qobject_cast(object); button && mouse_event->button() == Qt::RightButton) + if (const auto button = qobject_cast(object); button && button->isEnabled() && mouse_event->button() == Qt::RightButton) { if (const int button_id = m_buttons->id(button); button_id >= 0) {