summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/yuzu/main.cpp13
-rw-r--r--src/yuzu/main.h1
2 files changed, 12 insertions, 2 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 4e5552d2a..a246f6bb3 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -747,6 +747,8 @@ void GMainWindow::InitializeWidgets() {
747 747
748 shader_building_label = new QLabel(); 748 shader_building_label = new QLabel();
749 shader_building_label->setToolTip(tr("The amount of shaders currently being built")); 749 shader_building_label->setToolTip(tr("The amount of shaders currently being built"));
750 res_scale_label = new QLabel();
751 res_scale_label->setToolTip(tr("The current selected resolution scaling multiplier."));
750 emu_speed_label = new QLabel(); 752 emu_speed_label = new QLabel();
751 emu_speed_label->setToolTip( 753 emu_speed_label->setToolTip(
752 tr("Current emulation speed. Values higher or lower than 100% " 754 tr("Current emulation speed. Values higher or lower than 100% "
@@ -759,8 +761,8 @@ void GMainWindow::InitializeWidgets() {
759 tr("Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For " 761 tr("Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For "
760 "full-speed emulation this should be at most 16.67 ms.")); 762 "full-speed emulation this should be at most 16.67 ms."));
761 763
762 for (auto& label : 764 for (auto& label : {shader_building_label, res_scale_label, emu_speed_label, game_fps_label,
763 {shader_building_label, emu_speed_label, game_fps_label, emu_frametime_label}) { 765 emu_frametime_label}) {
764 label->setVisible(false); 766 label->setVisible(false);
765 label->setFrameStyle(QFrame::NoFrame); 767 label->setFrameStyle(QFrame::NoFrame);
766 label->setContentsMargins(4, 0, 4, 0); 768 label->setContentsMargins(4, 0, 4, 0);
@@ -1535,6 +1537,7 @@ void GMainWindow::ShutdownGame() {
1535 // Disable status bar updates 1537 // Disable status bar updates
1536 status_bar_update_timer.stop(); 1538 status_bar_update_timer.stop();
1537 shader_building_label->setVisible(false); 1539 shader_building_label->setVisible(false);
1540 res_scale_label->setVisible(false);
1538 emu_speed_label->setVisible(false); 1541 emu_speed_label->setVisible(false);
1539 game_fps_label->setVisible(false); 1542 game_fps_label->setVisible(false);
1540 emu_frametime_label->setVisible(false); 1543 emu_frametime_label->setVisible(false);
@@ -2981,6 +2984,11 @@ void GMainWindow::UpdateStatusBar() {
2981 shader_building_label->setVisible(false); 2984 shader_building_label->setVisible(false);
2982 } 2985 }
2983 2986
2987 const auto res_info = Settings::values.resolution_info;
2988 const auto res_scale = res_info.up_factor;
2989 res_scale_label->setText(
2990 tr("Scale: %1x", "%1 is the resolution scaling factor").arg(res_scale));
2991
2984 if (Settings::values.use_speed_limit.GetValue()) { 2992 if (Settings::values.use_speed_limit.GetValue()) {
2985 emu_speed_label->setText(tr("Speed: %1% / %2%") 2993 emu_speed_label->setText(tr("Speed: %1% / %2%")
2986 .arg(results.emulation_speed * 100.0, 0, 'f', 0) 2994 .arg(results.emulation_speed * 100.0, 0, 'f', 0)
@@ -2996,6 +3004,7 @@ void GMainWindow::UpdateStatusBar() {
2996 } 3004 }
2997 emu_frametime_label->setText(tr("Frame: %1 ms").arg(results.frametime * 1000.0, 0, 'f', 2)); 3005 emu_frametime_label->setText(tr("Frame: %1 ms").arg(results.frametime * 1000.0, 0, 'f', 2));
2998 3006
3007 res_scale_label->setVisible(true);
2999 emu_speed_label->setVisible(!Settings::values.use_multi_core.GetValue()); 3008 emu_speed_label->setVisible(!Settings::values.use_multi_core.GetValue());
3000 game_fps_label->setVisible(true); 3009 game_fps_label->setVisible(true);
3001 emu_frametime_label->setVisible(true); 3010 emu_frametime_label->setVisible(true);
diff --git a/src/yuzu/main.h b/src/yuzu/main.h
index 981102daa..beb4f2984 100644
--- a/src/yuzu/main.h
+++ b/src/yuzu/main.h
@@ -328,6 +328,7 @@ private:
328 // Status bar elements 328 // Status bar elements
329 QLabel* message_label = nullptr; 329 QLabel* message_label = nullptr;
330 QLabel* shader_building_label = nullptr; 330 QLabel* shader_building_label = nullptr;
331 QLabel* res_scale_label = nullptr;
331 QLabel* emu_speed_label = nullptr; 332 QLabel* emu_speed_label = nullptr;
332 QLabel* game_fps_label = nullptr; 333 QLabel* game_fps_label = nullptr;
333 QLabel* emu_frametime_label = nullptr; 334 QLabel* emu_frametime_label = nullptr;