preserve-emulation/RMG
1
0
Fork 0
mirror of https://github.com/Rosalie241/RMG.git synced 2026-07-11 01:24:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

RMG: capture value in signal lambdas instead of extracting from text

Browse Source
This commit is contained in:
Rosalie Wanders
2025-10-16 21:30:27 +02:00
parent 7154725520
commit 939db73b0b
2 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/RMG/UserInterface/MainWindow.cpp
+9 -17
View File
@@ -49,13 +49,14 @@
#include <QSettings>
#include <QStatusBar>
#include <QMenuBar>
#include <cstdlib>
#include <QString>
#include <QTimer>
#include <cmath>
#include <QDir>
#include <QUrl>
#include <cstdlib>
#include <cmath>
#include <RMG-Core/CachedRomHeaderAndSettings.hpp>
#include <RMG-Core/SpeedLimiter.hpp>
#include <RMG-Core/Directories.hpp>
@@ -1150,23 +1151,19 @@ void MainWindow::configureActions(void)
for (int i = 0; i < 12; i++)
{
QAction* speedAction = speedActions[i];
int speedActionNumber = speedActionNumbers[i];
speedAction->setCheckable(true);
speedAction->setChecked(currentSpeedFactor == speedActionNumbers[i]);
speedAction->setChecked(currentSpeedFactor == speedActionNumber);
speedAction->setActionGroup(speedActionGroup);
// connect emulation speed action here because we need to do
// something special for them
connect(speedAction, &QAction::triggered, [=, this](bool checked)
connect(speedAction, &QAction::triggered, [this, speedActionNumber](bool checked)
{
if (checked)
{
QString factorText = speedAction->text().split("%").first();
// sometimes the text can contain a '&'
// which will make the toInt() function return 0
// so strip it out
factorText.remove('&');
this->on_Action_System_SpeedFactor(factorText.toInt());
this->on_Action_System_SpeedFactor(speedActionNumber);
}
});
}
@@ -1183,16 +1180,11 @@ void MainWindow::configureActions(void)
// connect slot action here because we need to do
// something special for them
connect(slotAction, &QAction::triggered, [=, this](bool checked)
connect(slotAction, &QAction::triggered, [this, i](bool checked)
{
if (checked)
{
QString slotText = slotAction->text().split(" ").at(1);
// sometimes the text can contain a '&'
// which will make the toInt() function return 0
// so strip it out
slotText.remove('&');
this->on_Action_System_CurrentSaveState(slotText.toInt());
this->on_Action_System_CurrentSaveState(i);
}
});
}
Source/RMG/UserInterface/Widget/RomBrowser/RomBrowserWidget.cpp
+2 -7
View File
@@ -843,14 +843,9 @@ void RomBrowserWidget::generateStateMenu(void)
saveStateSlotText += saveStateFileInfo.lastModified().toString("dd/MM/yyyy hh:mm");
QAction* slotAction = this->menu_PlayGameWithSlot->addAction(saveStateSlotText);
connect(slotAction, &QAction::triggered, [=, this]()
connect(slotAction, &QAction::triggered, [this, i]()
{
QString slotText = slotAction->text().split(" ").at(1);
// sometimes the text can contain a '&'
// which will make the toInt() function return 0
// so strip it out
slotText.remove('&');
this->on_Action_PlayGameWithSlot(slotText.toInt());
this->on_Action_PlayGameWithSlot(i);
});
}
}