diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/main.cpp | 9 | ||||
| -rw-r--r-- | src/yuzu/main.h | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index f3529d151..10057b9ca 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp | |||
| @@ -30,6 +30,8 @@ | |||
| 30 | #include "core/hle/service/am/applet_oe.h" | 30 | #include "core/hle/service/am/applet_oe.h" |
| 31 | #include "core/hle/service/am/applets/applets.h" | 31 | #include "core/hle/service/am/applets/applets.h" |
| 32 | 32 | ||
| 33 | #include "input_common/tas/tas_input.h" | ||
| 34 | |||
| 33 | // These are wrappers to avoid the calls to CreateDirectory and CreateFile because of the Windows | 35 | // These are wrappers to avoid the calls to CreateDirectory and CreateFile because of the Windows |
| 34 | // defines. | 36 | // defines. |
| 35 | static FileSys::VirtualDir VfsFilesystemCreateDirectoryWrapper( | 37 | static FileSys::VirtualDir VfsFilesystemCreateDirectoryWrapper( |
| @@ -824,6 +826,12 @@ void GMainWindow::InitializeWidgets() { | |||
| 824 | }); | 826 | }); |
| 825 | statusBar()->insertPermanentWidget(0, renderer_status_button); | 827 | statusBar()->insertPermanentWidget(0, renderer_status_button); |
| 826 | 828 | ||
| 829 | TASlabel = new QLabel(); | ||
| 830 | TASlabel->setObjectName(QStringLiteral("TASlabel")); | ||
| 831 | TASlabel->setText(tr("TAS not running")); | ||
| 832 | TASlabel->setFocusPolicy(Qt::NoFocus); | ||
| 833 | statusBar()->insertPermanentWidget(0, TASlabel); | ||
| 834 | |||
| 827 | statusBar()->setVisible(true); | 835 | statusBar()->setVisible(true); |
| 828 | setStyleSheet(QStringLiteral("QStatusBar::item{border: none;}")); | 836 | setStyleSheet(QStringLiteral("QStatusBar::item{border: none;}")); |
| 829 | } | 837 | } |
| @@ -2894,6 +2902,7 @@ void GMainWindow::UpdateStatusBar() { | |||
| 2894 | return; | 2902 | return; |
| 2895 | } | 2903 | } |
| 2896 | 2904 | ||
| 2905 | TASlabel->setText(tr(input_subsystem->GetTas()->GetStatusDescription().c_str())); | ||
| 2897 | auto& system = Core::System::GetInstance(); | 2906 | auto& system = Core::System::GetInstance(); |
| 2898 | auto results = system.GetAndResetPerfStats(); | 2907 | auto results = system.GetAndResetPerfStats(); |
| 2899 | auto& shader_notify = system.GPU().ShaderNotify(); | 2908 | auto& shader_notify = system.GPU().ShaderNotify(); |
diff --git a/src/yuzu/main.h b/src/yuzu/main.h index 38e66ccd0..edca661ac 100644 --- a/src/yuzu/main.h +++ b/src/yuzu/main.h | |||
| @@ -318,6 +318,7 @@ private: | |||
| 318 | QLabel* emu_speed_label = nullptr; | 318 | QLabel* emu_speed_label = nullptr; |
| 319 | QLabel* game_fps_label = nullptr; | 319 | QLabel* game_fps_label = nullptr; |
| 320 | QLabel* emu_frametime_label = nullptr; | 320 | QLabel* emu_frametime_label = nullptr; |
| 321 | QLabel* TASlabel; | ||
| 321 | QPushButton* gpu_accuracy_button = nullptr; | 322 | QPushButton* gpu_accuracy_button = nullptr; |
| 322 | QPushButton* renderer_status_button = nullptr; | 323 | QPushButton* renderer_status_button = nullptr; |
| 323 | QPushButton* dock_status_button = nullptr; | 324 | QPushButton* dock_status_button = nullptr; |