diff options
author | TheKoopaKingdom <thekoopakingdom@gmail.com> | 2017-04-13 07:10:19 +0200 |
---|---|---|
committer | TheKoopaKingdom <thekoopakingdom@gmail.com> | 2017-06-03 00:28:14 +0200 |
commit | b6bab59000cbcdb34aed3f8633c5aae391db6dcb (patch) | |
tree | 62ee71c8b38011342574b0d68f2e75b5303643ea /src/citra_qt | |
parent | Made some changes from review comments: (diff) | |
download | yuzu-b6bab59000cbcdb34aed3f8633c5aae391db6dcb.tar yuzu-b6bab59000cbcdb34aed3f8633c5aae391db6dcb.tar.gz yuzu-b6bab59000cbcdb34aed3f8633c5aae391db6dcb.tar.bz2 yuzu-b6bab59000cbcdb34aed3f8633c5aae391db6dcb.tar.lz yuzu-b6bab59000cbcdb34aed3f8633c5aae391db6dcb.tar.xz yuzu-b6bab59000cbcdb34aed3f8633c5aae391db6dcb.tar.zst yuzu-b6bab59000cbcdb34aed3f8633c5aae391db6dcb.zip |
Diffstat (limited to 'src/citra_qt')
-rw-r--r-- | src/citra_qt/main.cpp | 11 | ||||
-rw-r--r-- | src/citra_qt/main.h | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index cc38cfc0e..6121d4728 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -93,6 +93,14 @@ void GMainWindow::InitializeWidgets() { ui.horizontalLayout->addWidget(game_list); // Create status bar + message_label = new QLabel(); + // Configured separately for left alignment + message_label->setVisible(false); + message_label->setFrameStyle(QFrame::NoFrame); + message_label->setContentsMargins(4, 0, 4, 0); + message_label->setAlignment(Qt::AlignLeft); + statusBar()->addPermanentWidget(message_label, 1); + emu_speed_label = new QLabel(); emu_speed_label->setToolTip(tr("Current emulation speed. Values higher or lower than 100% " "indicate emulation is running faster or slower than a 3DS.")); @@ -108,7 +116,7 @@ void GMainWindow::InitializeWidgets() { label->setVisible(false); label->setFrameStyle(QFrame::NoFrame); label->setContentsMargins(4, 0, 4, 0); - statusBar()->addPermanentWidget(label); + statusBar()->addPermanentWidget(label, 0); } statusBar()->setVisible(true); setStyleSheet("QStatusBar::item{border: none;}"); @@ -437,6 +445,7 @@ void GMainWindow::ShutdownGame() { // Disable status bar updates status_bar_update_timer.stop(); + message_label->setVisible(false); emu_speed_label->setVisible(false); game_fps_label->setVisible(false); emu_frametime_label->setVisible(false); diff --git a/src/citra_qt/main.h b/src/citra_qt/main.h index 1ce0607e2..3ecbc001e 100644 --- a/src/citra_qt/main.h +++ b/src/citra_qt/main.h @@ -136,6 +136,7 @@ private: GameList* game_list; // Status bar elements + QLabel* message_label = nullptr; QLabel* emu_speed_label = nullptr; QLabel* game_fps_label = nullptr; QLabel* emu_frametime_label = nullptr; |