eden-emu/eden
14
3
Fork 4
Code Issues 3 Pull requests 3 Projects Releases 2 Packages Wiki Activity Actions 2

remove duplicate code in statusbar
Some checks failed
eden-build / source (pull_request) Has been skipped
Details
eden-build / linux (pull_request) Successful in 22m33s
Details
eden-build / android (pull_request) Successful in 15m24s
Details
eden-license / license-header (pull_request_target) Failing after 22s
Details
eden-build / windows (msvc) (pull_request) Successful in 59m24s
Details

Browse source 
Signed-off-by: swurl <swurl@swurl.xyz>
This commit is contained in:
swurl 2025-04-23 20:09:59 -04:00
parent 2de35b47a6
commit 2b392d8b2a
Signed by: crueter
GPG key ID: A5A7629F109C8FD1
1 changed files with 412 additions and 416 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/yuzu/main.cpp
View file

@ -1344,7 +1344,7 @@ void GMainWindow::InitializeHotkeys() {
connect(hotkey, &QShortcut::activated, this, function);
connect(controller_hotkey, &ControllerShortcut::Activated, this, function,
Qt::QueuedConnection);
};
};
connect_shortcut(QStringLiteral("Exit Fullscreen"), [&] {
if (emulation_running && ui->action_Fullscreen->isChecked()) {
@ -1508,7 +1508,7 @@ void GMainWindow::ConnectMenuEvents() {
addAction(action);
// Add actions to the render window so that they work outside of single window mode
render_window->addAction(action);
};
};
// File
connect_menu(ui->action_Load_File, &GMainWindow::OnMenuLoadFile);
@ -4649,13 +4649,9 @@ void GMainWindow::UpdateStatusBar() {
} else {
emu_speed_label->setText(tr("Speed: %1%").arg(results.emulation_speed * 100.0, 0, 'f', 0));
}
if (!Settings::values.use_speed_limit) {
game_fps_label->setText(
tr("Game: %1 FPS (Unlocked)").arg(std::round(results.average_game_fps), 0, 'f', 0));
} else {
game_fps_label->setText(
tr("Game: %1 FPS").arg(std::round(results.average_game_fps), 0, 'f', 0));
}
tr("Game: %1 FPS").arg(std::round(results.average_game_fps), 0, 'f', 0) + tr(Settings::values.use_speed_limit ? " (Unlocked)" : ""));
emu_frametime_label->setText(tr("Frame: %1 ms").arg(results.frametime * 1000.0, 0, 'f', 2));
res_scale_label->setVisible(true);