mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-12-09 13:19:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Qt: prevent saving/canceling for remapping/hotkeys dialogs while waiting for inputs (#3499)

Browse Source 
* prevent saving/canceling dialog while mapping mode is enabled

* do not disable cancel button

* diable defaults button
This commit is contained in:
rainmakerv2
2025-09-02 02:08:17 +08:00
committed by GitHub
parent 47e0d488d8
commit b4a82bfcdd
3 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/qt_gui/control_settings.cpp
View File

@@ -756,6 +756,10 @@ void ControlSettings::DisableMappingButtons() {
for (const auto& i : AxisList) { for (const auto& i : AxisList) {
i->setEnabled(false); i->setEnabled(false);
} }
ui->buttonBox->button(QDialogButtonBox::Save)->setEnabled(false);
ui->buttonBox->button(QDialogButtonBox::Apply)->setEnabled(false);
ui->buttonBox->button(QDialogButtonBox::RestoreDefaults)->setEnabled(false);
} }
void ControlSettings::EnableMappingButtons() { void ControlSettings::EnableMappingButtons() {
@@ -766,6 +770,10 @@ void ControlSettings::EnableMappingButtons() {
for (const auto& i : AxisList) { for (const auto& i : AxisList) {
i->setEnabled(true); i->setEnabled(true);
} }
ui->buttonBox->button(QDialogButtonBox::Save)->setEnabled(true);
ui->buttonBox->button(QDialogButtonBox::Apply)->setEnabled(true);
ui->buttonBox->button(QDialogButtonBox::RestoreDefaults)->setEnabled(true);
} }
void ControlSettings::ConnectAxisInputs(QPushButton*& button) { void ControlSettings::ConnectAxisInputs(QPushButton*& button) {

6
src/qt_gui/hotkeys.cpp
View File

@@ -70,12 +70,18 @@ void hotkeys::DisableMappingButtons() {
for (const auto& i : ButtonsList) { for (const auto& i : ButtonsList) {
i->setEnabled(false); i->setEnabled(false);
} }
ui->buttonBox->button(QDialogButtonBox::Save)->setEnabled(false);
ui->buttonBox->button(QDialogButtonBox::Apply)->setEnabled(false);
} }
void hotkeys::EnableMappingButtons() { void hotkeys::EnableMappingButtons() {
for (const auto& i : ButtonsList) { for (const auto& i : ButtonsList) {
i->setEnabled(true); i->setEnabled(true);
} }
ui->buttonBox->button(QDialogButtonBox::Save)->setEnabled(true);
ui->buttonBox->button(QDialogButtonBox::Apply)->setEnabled(true);
} }
void hotkeys::SaveHotkeys(bool CloseOnSave) { void hotkeys::SaveHotkeys(bool CloseOnSave) {

8
src/qt_gui/kbm_gui.cpp
View File

@@ -162,12 +162,20 @@ void KBMSettings::DisableMappingButtons() {
for (const auto& i : ButtonsList) { for (const auto& i : ButtonsList) {
i->setEnabled(false); i->setEnabled(false);
} }
ui->buttonBox->button(QDialogButtonBox::Save)->setEnabled(false);
ui->buttonBox->button(QDialogButtonBox::Apply)->setEnabled(false);
ui->buttonBox->button(QDialogButtonBox::RestoreDefaults)->setEnabled(false);
} }
void KBMSettings::EnableMappingButtons() { void KBMSettings::EnableMappingButtons() {
for (const auto& i : ButtonsList) { for (const auto& i : ButtonsList) {
i->setEnabled(true); i->setEnabled(true);
} }
ui->buttonBox->button(QDialogButtonBox::Save)->setEnabled(true);
ui->buttonBox->button(QDialogButtonBox::Apply)->setEnabled(true);
ui->buttonBox->button(QDialogButtonBox::RestoreDefaults)->setEnabled(true);
} }
void KBMSettings::SaveKBMConfig(bool close_on_save) { void KBMSettings::SaveKBMConfig(bool close_on_save) {