Skip to content

Commit 65e890f

Browse files
committed
Qt: Fix incorrect use of toggled signal
Fixes frame stepping, probably others. Regression from 9ee1b02.
1 parent de36fef commit 65e890f

11 files changed

+47
-49
lines changed

src/duckstation-qt/debuggerwindow.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ void DebuggerWindow::scrollToCodeAddress(VirtualMemoryAddress address, bool cent
9292
m_ui.codeView->setSelectedAddress(address);
9393
}
9494

95-
void DebuggerWindow::onPauseActionToggled(bool paused)
95+
void DebuggerWindow::onPauseActionTriggered(bool paused)
9696
{
9797
if (!paused)
9898
{
@@ -459,7 +459,7 @@ void DebuggerWindow::connectSignals()
459459
connect(g_emu_thread, &EmuThread::systemDestroyed, this, &DebuggerWindow::onSystemDestroyed);
460460
connect(g_emu_thread, &EmuThread::debuggerMessageReported, this, &DebuggerWindow::onDebuggerMessageReported);
461461

462-
connect(m_ui.actionPause, &QAction::toggled, this, &DebuggerWindow::onPauseActionToggled);
462+
connect(m_ui.actionPause, &QAction::triggered, this, &DebuggerWindow::onPauseActionTriggered);
463463
connect(m_ui.actionRunToCursor, &QAction::triggered, this, &DebuggerWindow::onRunToCursorTriggered);
464464
connect(m_ui.actionGoToPC, &QAction::triggered, this, &DebuggerWindow::onGoToPCTriggered);
465465
connect(m_ui.actionGoToAddress, &QAction::triggered, this, &DebuggerWindow::onGoToAddressTriggered);

src/duckstation-qt/debuggerwindow.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class DebuggerWindow : public QMainWindow
6060
void timerRefresh();
6161
void refreshAll();
6262

63-
void onPauseActionToggled(bool paused);
63+
void onPauseActionTriggered(bool paused);
6464
void onRunToCursorTriggered();
6565
void onGoToPCTriggered();
6666
void onGoToAddressTriggered();

src/duckstation-qt/gamecheatsettingswidget.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ GameCheatSettingsWidget::GameCheatSettingsWidget(SettingsWindow* dialog, QWidget
200200
m_ui.sortCheats->setChecked(sorting_enabled);
201201

202202
connect(m_ui.enableCheats, &QCheckBox::checkStateChanged, this, &GameCheatSettingsWidget::onEnableCheatsChanged);
203-
connect(m_ui.sortCheats, &QPushButton::toggled, this, &GameCheatSettingsWidget::onSortCheatsToggled);
203+
connect(m_ui.sortCheats, &QPushButton::clicked, this, &GameCheatSettingsWidget::onSortCheatsClicked);
204204
connect(m_ui.search, &QLineEdit::textChanged, this, &GameCheatSettingsWidget::onSearchFilterChanged);
205205
connect(m_ui.loadDatabaseCheats, &QCheckBox::checkStateChanged, this,
206206
&GameCheatSettingsWidget::onLoadDatabaseCheatsChanged);
@@ -271,7 +271,7 @@ void GameCheatSettingsWidget::onEnableCheatsChanged(Qt::CheckState state)
271271
m_dialog->saveAndReloadGameSettings();
272272
}
273273

274-
void GameCheatSettingsWidget::onSortCheatsToggled(bool checked)
274+
void GameCheatSettingsWidget::onSortCheatsClicked(bool checked)
275275
{
276276
m_sort_model->sort(checked ? 0 : -1, Qt::AscendingOrder);
277277

src/duckstation-qt/gamecheatsettingswidget.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class GameCheatSettingsWidget : public QWidget
4545

4646
private:
4747
void onEnableCheatsChanged(Qt::CheckState state);
48-
void onSortCheatsToggled(bool checked);
48+
void onSortCheatsClicked(bool checked);
4949
void onSearchFilterChanged(const QString& text);
5050
void onLoadDatabaseCheatsChanged(Qt::CheckState state);
5151
void onCheatListItemDoubleClicked(const QModelIndex& index);

src/duckstation-qt/mainwindow.cpp

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1371,7 +1371,7 @@ void MainWindow::onResetGameActionTriggered()
13711371
g_emu_thread->resetSystem(true);
13721372
}
13731373

1374-
void MainWindow::onPauseActionToggled(bool checked)
1374+
void MainWindow::onPauseActionTriggered(bool checked)
13751375
{
13761376
if (s_system_paused == checked)
13771377
return;
@@ -1407,15 +1407,15 @@ void MainWindow::onScanForNewGamesTriggered()
14071407
refreshGameList(false);
14081408
}
14091409

1410-
void MainWindow::onViewToolbarActionToggled(bool checked)
1410+
void MainWindow::onViewToolbarActionTriggered(bool checked)
14111411
{
14121412
Host::SetBaseBoolSettingValue("UI", "ShowToolbar", checked);
14131413
Host::CommitBaseSettingChanges();
14141414
m_ui.toolBar->setVisible(checked);
14151415
updateToolbarIconStyle();
14161416
}
14171417

1418-
void MainWindow::onViewToolbarLockActionToggled(bool checked)
1418+
void MainWindow::onViewToolbarLockActionTriggered(bool checked)
14191419
{
14201420
Host::SetBaseBoolSettingValue("UI", "LockToolbar", checked);
14211421
Host::CommitBaseSettingChanges();
@@ -1425,7 +1425,7 @@ void MainWindow::onViewToolbarLockActionToggled(bool checked)
14251425
m_ui.actionViewLockToolbar->setChecked(checked);
14261426
}
14271427

1428-
void MainWindow::onViewToolbarSmallIconsActionToggled(bool checked)
1428+
void MainWindow::onViewToolbarSmallIconsActionTriggered(bool checked)
14291429
{
14301430
Host::SetBaseBoolSettingValue("UI", "ToolbarSmallIcons", checked);
14311431
Host::CommitBaseSettingChanges();
@@ -1435,7 +1435,7 @@ void MainWindow::onViewToolbarSmallIconsActionToggled(bool checked)
14351435
m_ui.actionViewSmallToolbarIcons->setChecked(checked);
14361436
}
14371437

1438-
void MainWindow::onViewToolbarLabelsActionToggled(bool checked)
1438+
void MainWindow::onViewToolbarLabelsActionTriggered(bool checked)
14391439
{
14401440
Host::SetBaseBoolSettingValue("UI", "ToolbarLabels", checked);
14411441
Host::CommitBaseSettingChanges();
@@ -1445,7 +1445,7 @@ void MainWindow::onViewToolbarLabelsActionToggled(bool checked)
14451445
m_ui.actionViewToolbarLabels->setChecked(checked);
14461446
}
14471447

1448-
void MainWindow::onViewToolbarLabelsBesideIconsActionToggled(bool checked)
1448+
void MainWindow::onViewToolbarLabelsBesideIconsActionTriggered(bool checked)
14491449
{
14501450
Host::SetBaseBoolSettingValue("UI", "ToolbarLabelsBesideIcons", checked);
14511451
Host::CommitBaseSettingChanges();
@@ -1455,7 +1455,7 @@ void MainWindow::onViewToolbarLabelsBesideIconsActionToggled(bool checked)
14551455
m_ui.actionViewToolbarLabelsBesideIcons->setChecked(checked);
14561456
}
14571457

1458-
void MainWindow::onViewStatusBarActionToggled(bool checked)
1458+
void MainWindow::onViewStatusBarActionTriggered(bool checked)
14591459
{
14601460
Host::SetBaseBoolSettingValue("UI", "ShowStatusBar", checked);
14611461
Host::CommitBaseSettingChanges();
@@ -2047,23 +2047,23 @@ void MainWindow::onToolbarContextMenuRequested(const QPoint& pos)
20472047
QAction* action = menu->addAction(tr("Lock Toolbar"));
20482048
action->setCheckable(true);
20492049
action->setChecked(!m_ui.toolBar->isMovable());
2050-
connect(action, &QAction::toggled, this, &MainWindow::onViewToolbarLockActionToggled);
2050+
connect(action, &QAction::triggered, this, &MainWindow::onViewToolbarLockActionTriggered);
20512051

20522052
action = menu->addAction(tr("Small Icons"));
20532053
action->setCheckable(true);
20542054
action->setChecked(Host::GetBaseBoolSettingValue("UI", "ToolbarSmallIcons", false));
2055-
connect(action, &QAction::toggled, this, &MainWindow::onViewToolbarSmallIconsActionToggled);
2055+
connect(action, &QAction::triggered, this, &MainWindow::onViewToolbarSmallIconsActionTriggered);
20562056

20572057
action = menu->addAction(tr("Show Labels"));
20582058
action->setCheckable(true);
20592059
action->setChecked(Host::GetBaseBoolSettingValue("UI", "ToolbarLabels", true));
2060-
connect(action, &QAction::toggled, this, &MainWindow::onViewToolbarLabelsActionToggled);
2060+
connect(action, &QAction::triggered, this, &MainWindow::onViewToolbarLabelsActionTriggered);
20612061

20622062
action = menu->addAction(tr("Labels Beside Icons"));
20632063
action->setCheckable(true);
20642064
action->setChecked(Host::GetBaseBoolSettingValue("UI", "ToolbarLabelsBesideIcons", false));
20652065
action->setEnabled(show_labels);
2066-
connect(action, &QAction::toggled, this, &MainWindow::onViewToolbarLabelsBesideIconsActionToggled);
2066+
connect(action, &QAction::triggered, this, &MainWindow::onViewToolbarLabelsBesideIconsActionTriggered);
20672067

20682068
QMenu* const position_menu = menu->addMenu(tr("Position"));
20692069
QtUtils::StylePopupMenu(position_menu);
@@ -2091,7 +2091,7 @@ void MainWindow::onToolbarContextMenuRequested(const QPoint& pos)
20912091
QAction* const menu_action = menu->addAction((m_ui.*action_ptr)->iconText());
20922092
menu_action->setCheckable(true);
20932093
menu_action->setChecked(StringUtil::IsInStringList(active_buttons, name));
2094-
connect(menu_action, &QAction::toggled, this, [this, name](bool checked) {
2094+
connect(menu_action, &QAction::triggered, this, [this, name](bool checked) {
20952095
const std::string active_buttons_str =
20962096
Host::GetBaseStringSettingValue("UI", "ToolbarButtons", DEFAULT_TOOLBAR_ACTIONS);
20972097
std::vector<std::string_view> active_buttons = StringUtil::SplitString(active_buttons_str, ',');
@@ -2417,7 +2417,7 @@ void MainWindow::connectSignals()
24172417
connect(m_ui.actionCloseGameWithoutSaving, &QAction::triggered, this,
24182418
&MainWindow::onCloseGameWithoutSavingActionTriggered);
24192419
connect(m_ui.actionResetGame, &QAction::triggered, this, &MainWindow::onResetGameActionTriggered);
2420-
connect(m_ui.actionPause, &QAction::toggled, this, &MainWindow::onPauseActionToggled);
2420+
connect(m_ui.actionPause, &QAction::triggered, this, &MainWindow::onPauseActionTriggered);
24212421
connect(m_ui.actionScreenshot, &QAction::triggered, g_emu_thread, &EmuThread::saveScreenshot);
24222422
connect(m_ui.actionScanForNewGames, &QAction::triggered, this, &MainWindow::onScanForNewGamesTriggered);
24232423
connect(m_ui.actionRescanAllGames, &QAction::triggered, this, [this]() { refreshGameList(true); });
@@ -2444,13 +2444,13 @@ void MainWindow::connectSignals()
24442444
connect(m_ui.actionFolderSettings, &QAction::triggered, [this]() { doSettings("Folders"); });
24452445
connect(m_ui.actionAdvancedSettings, &QAction::triggered, [this]() { doSettings("Advanced"); });
24462446
connect(m_ui.actionControllerProfiles, &QAction::triggered, this, &MainWindow::onSettingsControllerProfilesTriggered);
2447-
connect(m_ui.actionViewToolbar, &QAction::toggled, this, &MainWindow::onViewToolbarActionToggled);
2448-
connect(m_ui.actionViewLockToolbar, &QAction::toggled, this, &MainWindow::onViewToolbarLockActionToggled);
2449-
connect(m_ui.actionViewSmallToolbarIcons, &QAction::toggled, this, &MainWindow::onViewToolbarSmallIconsActionToggled);
2450-
connect(m_ui.actionViewToolbarLabels, &QAction::toggled, this, &MainWindow::onViewToolbarLabelsActionToggled);
2451-
connect(m_ui.actionViewToolbarLabelsBesideIcons, &QAction::toggled, this,
2452-
&MainWindow::onViewToolbarLabelsBesideIconsActionToggled);
2453-
connect(m_ui.actionViewStatusBar, &QAction::toggled, this, &MainWindow::onViewStatusBarActionToggled);
2447+
connect(m_ui.actionViewToolbar, &QAction::triggered, this, &MainWindow::onViewToolbarActionTriggered);
2448+
connect(m_ui.actionViewLockToolbar, &QAction::triggered, this, &MainWindow::onViewToolbarLockActionTriggered);
2449+
connect(m_ui.actionViewSmallToolbarIcons, &QAction::triggered, this, &MainWindow::onViewToolbarSmallIconsActionTriggered);
2450+
connect(m_ui.actionViewToolbarLabels, &QAction::triggered, this, &MainWindow::onViewToolbarLabelsActionTriggered);
2451+
connect(m_ui.actionViewToolbarLabelsBesideIcons, &QAction::triggered, this,
2452+
&MainWindow::onViewToolbarLabelsBesideIconsActionTriggered);
2453+
connect(m_ui.actionViewStatusBar, &QAction::triggered, this, &MainWindow::onViewStatusBarActionTriggered);
24542454
connect(m_ui.actionViewGameList, &QAction::triggered, this, &MainWindow::onViewGameListActionTriggered);
24552455
connect(m_ui.actionViewGameGrid, &QAction::triggered, this, &MainWindow::onViewGameGridActionTriggered);
24562456
connect(m_ui.actionViewSystemDisplay, &QAction::triggered, this, &MainWindow::onViewSystemDisplayTriggered);
@@ -2468,7 +2468,7 @@ void MainWindow::connectSignals()
24682468
connect(m_ui.actionISOBrowser, &QAction::triggered, this, &MainWindow::onToolsISOBrowserTriggered);
24692469
connect(m_ui.actionCoverDownloader, &QAction::triggered, this, &MainWindow::onToolsCoverDownloaderTriggered);
24702470
connect(m_ui.actionControllerTest, &QAction::triggered, g_emu_thread, &EmuThread::startControllerTest);
2471-
connect(m_ui.actionMediaCapture, &QAction::toggled, this, &MainWindow::onToolsMediaCaptureToggled);
2471+
connect(m_ui.actionMediaCapture, &QAction::triggered, this, &MainWindow::onToolsMediaCaptureTriggered);
24722472
connect(m_ui.actionCaptureGPUFrame, &QAction::triggered, g_emu_thread, &EmuThread::captureGPUFrameDump);
24732473
connect(m_ui.actionCPUDebugger, &QAction::triggered, this, &MainWindow::openCPUDebugger);
24742474
connect(m_ui.actionOpenDataDirectory, &QAction::triggered, this, &MainWindow::onToolsOpenDataDirectoryTriggered);
@@ -3267,7 +3267,7 @@ void MainWindow::onToolsCoverDownloaderTriggered()
32673267
QtUtils::ShowOrRaiseWindow(m_cover_download_window, this, true);
32683268
}
32693269

3270-
void MainWindow::onToolsMediaCaptureToggled(bool checked)
3270+
void MainWindow::onToolsMediaCaptureTriggered(bool checked)
32713271
{
32723272
if (!s_system_valid)
32733273
{

src/duckstation-qt/mainwindow.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -272,16 +272,16 @@ class MainWindow final : public QMainWindow
272272
void onCloseGameActionTriggered();
273273
void onCloseGameWithoutSavingActionTriggered();
274274
void onResetGameActionTriggered();
275-
void onPauseActionToggled(bool checked);
275+
void onPauseActionTriggered(bool checked);
276276
void onFullscreenUIStartedOrStopped(bool running);
277277
void onRemoveDiscActionTriggered();
278278
void onScanForNewGamesTriggered();
279-
void onViewToolbarActionToggled(bool checked);
280-
void onViewToolbarLockActionToggled(bool checked);
281-
void onViewToolbarSmallIconsActionToggled(bool checked);
282-
void onViewToolbarLabelsActionToggled(bool checked);
283-
void onViewToolbarLabelsBesideIconsActionToggled(bool checked);
284-
void onViewStatusBarActionToggled(bool checked);
279+
void onViewToolbarActionTriggered(bool checked);
280+
void onViewToolbarLockActionTriggered(bool checked);
281+
void onViewToolbarSmallIconsActionTriggered(bool checked);
282+
void onViewToolbarLabelsActionTriggered(bool checked);
283+
void onViewToolbarLabelsBesideIconsActionTriggered(bool checked);
284+
void onViewStatusBarActionTriggered(bool checked);
285285
void onViewGameListActionTriggered();
286286
void onViewGameGridActionTriggered();
287287
void onViewSystemDisplayTriggered();
@@ -298,7 +298,7 @@ class MainWindow final : public QMainWindow
298298
void onToolsMemoryScannerTriggered();
299299
void onToolsISOBrowserTriggered();
300300
void onToolsCoverDownloaderTriggered();
301-
void onToolsMediaCaptureToggled(bool checked);
301+
void onToolsMediaCaptureTriggered(bool checked);
302302
void onToolsOpenDataDirectoryTriggered();
303303
void onToolsOpenTextureDirectoryTriggered();
304304
void onSettingsTriggeredFromToolbar();

src/duckstation-qt/postprocessingsettingswidget.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ void PostProcessingChainConfigWidget::connectUi()
9090
connect(m_ui.moveUp, &QPushButton::clicked, this, &PostProcessingChainConfigWidget::onMoveUpButtonClicked);
9191
connect(m_ui.moveDown, &QPushButton::clicked, this, &PostProcessingChainConfigWidget::onMoveDownButtonClicked);
9292
connect(m_ui.stages, &QListWidget::itemSelectionChanged, this,
93-
&PostProcessingChainConfigWidget::onSelectedShaderChanged);
94-
connect(m_ui.stages, &QListWidget::itemChanged, this, &PostProcessingChainConfigWidget::onShaderToggled);
93+
&PostProcessingChainConfigWidget::onStageItemSelectionChanged);
94+
connect(m_ui.stages, &QListWidget::itemChanged, this, &PostProcessingChainConfigWidget::onStageItemChanged);
9595
}
9696

9797
std::optional<u32> PostProcessingChainConfigWidget::getSelectedIndex() const
@@ -286,13 +286,13 @@ void PostProcessingChainConfigWidget::onOpenDirectoryButtonClicked()
286286
QtUtils::OpenURL(this, QUrl::fromLocalFile(QString::fromStdString(EmuFolders::Shaders)));
287287
}
288288

289-
void PostProcessingChainConfigWidget::onSelectedShaderChanged()
289+
void PostProcessingChainConfigWidget::onStageItemSelectionChanged()
290290
{
291291
std::optional<u32> index = getSelectedIndex();
292292
updateButtonsAndConfigPane(index);
293293
}
294294

295-
void PostProcessingChainConfigWidget::onShaderToggled(QListWidgetItem* item)
295+
void PostProcessingChainConfigWidget::onStageItemChanged(QListWidgetItem* item)
296296
{
297297
if (!item)
298298
return;

src/duckstation-qt/postprocessingsettingswidget.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ class PostProcessingChainConfigWidget : public QWidget
5252
void onMoveDownButtonClicked();
5353
void onReloadButtonClicked();
5454
void onOpenDirectoryButtonClicked();
55-
void onSelectedShaderChanged();
56-
void onShaderToggled(QListWidgetItem* item);
55+
void onStageItemSelectionChanged();
56+
void onStageItemChanged(QListWidgetItem* item);
5757
void triggerSettingsReload();
5858

5959
SettingsWindow* m_dialog;

src/duckstation-qt/qthost.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1167,13 +1167,11 @@ void EmuThread::resetSystem(bool check_memcard_busy)
11671167
System::ResetSystem();
11681168
}
11691169

1170-
void EmuThread::setSystemPaused(bool paused, bool wait_until_paused /* = false */)
1170+
void EmuThread::setSystemPaused(bool paused)
11711171
{
11721172
if (!isCurrentThread())
11731173
{
1174-
QMetaObject::invokeMethod(this, &EmuThread::setSystemPaused,
1175-
wait_until_paused ? Qt::BlockingQueuedConnection : Qt::QueuedConnection, paused,
1176-
wait_until_paused);
1174+
QMetaObject::invokeMethod(this, &EmuThread::setSystemPaused, Qt::QueuedConnection, paused);
11771175
return;
11781176
}
11791177

src/duckstation-qt/qthost.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ class EmuThread : public QThread
153153
void resumeSystemFromMostRecentState();
154154
void shutdownSystem(bool save_state, bool check_memcard_busy);
155155
void resetSystem(bool check_memcard_busy);
156-
void setSystemPaused(bool paused, bool wait_until_paused = false);
156+
void setSystemPaused(bool paused);
157157
void changeDisc(const QString& new_disc_path, bool reset_system, bool check_memcard_busy);
158158
void changeDiscFromPlaylist(quint32 index);
159159
void loadState(const QString& path);

0 commit comments

Comments
 (0)