summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Kyle Kienapfel2022-06-01 00:59:58 -0700
committerGravatar Kyle Kienapfel2022-06-01 17:22:53 -0700
commit054732210eee2f9ac8f3d026aa8e94ddc94590cf (patch)
tree9418de5c17c0f7aa8ec3305f3972b4a60cf0b657
parentMerge pull request #8385 from lat9nq/just-subsys-win (diff)
downloadyuzu-054732210eee2f9ac8f3d026aa8e94ddc94590cf.tar.gz
yuzu-054732210eee2f9ac8f3d026aa8e94ddc94590cf.tar.xz
yuzu-054732210eee2f9ac8f3d026aa8e94ddc94590cf.zip
ui: Status bars dock button becomes dock/undock button
For people not used to the Yuzu UI it's not always clear if the emulated console is docked or not. The other items update their text when clicked, this PR brings the DOCK button in line with this. DOCK -> DOCKED or HANDHELD
-rw-r--r--dist/qt_themes/default/style.qss13
-rw-r--r--dist/qt_themes/qdarkstyle/style.qss13
-rw-r--r--dist/qt_themes/qdarkstyle_midnight_blue/style.qss13
-rw-r--r--src/yuzu/main.cpp15
-rw-r--r--src/yuzu/main.h1
5 files changed, 50 insertions, 5 deletions
diff --git a/dist/qt_themes/default/style.qss b/dist/qt_themes/default/style.qss
index f0908a7f1..12e681648 100644
--- a/dist/qt_themes/default/style.qss
+++ b/dist/qt_themes/default/style.qss
@@ -58,6 +58,19 @@ QPushButton#GPUStatusBarButton:!checked {
58 color: #109010; 58 color: #109010;
59} 59}
60 60
61QPushButton#DockingStatusBarButton {
62 min-width: 0px;
63 color: #000000;
64 border: 1px solid transparent;
65 background-color: transparent;
66 padding: 0px 3px 0px 3px;
67 text-align: center;
68}
69
70QPushButton#DockingStatusBarButton:hover {
71 border: 1px solid #76797C;
72}
73
61QPushButton#buttonRefreshDevices { 74QPushButton#buttonRefreshDevices {
62 min-width: 21px; 75 min-width: 21px;
63 min-height: 21px; 76 min-height: 21px;
diff --git a/dist/qt_themes/qdarkstyle/style.qss b/dist/qt_themes/qdarkstyle/style.qss
index dac2dba86..63a636ae6 100644
--- a/dist/qt_themes/qdarkstyle/style.qss
+++ b/dist/qt_themes/qdarkstyle/style.qss
@@ -1304,6 +1304,19 @@ QPushButton#GPUStatusBarButton:!checked {
1304 color: #40dd40; 1304 color: #40dd40;
1305} 1305}
1306 1306
1307QPushButton#DockingStatusBarButton {
1308 min-width: 0px;
1309 color: #ffffff;
1310 border: 1px solid transparent;
1311 background-color: transparent;
1312 padding: 0px 3px 0px 3px;
1313 text-align: center;
1314}
1315
1316QPushButton#DockingStatusBarButton:hover {
1317 border: 1px solid #76797C;
1318}
1319
1307QPushButton#buttonRefreshDevices { 1320QPushButton#buttonRefreshDevices {
1308 min-width: 23px; 1321 min-width: 23px;
1309 min-height: 23px; 1322 min-height: 23px;
diff --git a/dist/qt_themes/qdarkstyle_midnight_blue/style.qss b/dist/qt_themes/qdarkstyle_midnight_blue/style.qss
index 032d05ec6..49b05c8ba 100644
--- a/dist/qt_themes/qdarkstyle_midnight_blue/style.qss
+++ b/dist/qt_themes/qdarkstyle_midnight_blue/style.qss
@@ -2207,6 +2207,19 @@ QPushButton#GPUStatusBarButton:!checked {
2207 color: #40dd40; 2207 color: #40dd40;
2208} 2208}
2209 2209
2210QPushButton#DockingStatusBarButton {
2211 min-width: 0px;
2212 color: #ffffff;
2213 border: 1px solid transparent;
2214 background-color: transparent;
2215 padding: 0px 3px 0px 3px;
2216 text-align: center;
2217}
2218
2219QPushButton#DockingStatusBarButton:hover {
2220 border: 1px solid #76797C;
2221}
2222
2210QPushButton#buttonRefreshDevices { 2223QPushButton#buttonRefreshDevices {
2211 min-width: 19px; 2224 min-width: 19px;
2212 min-height: 19px; 2225 min-height: 19px;
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index f4a9a7171..695015477 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -827,12 +827,11 @@ void GMainWindow::InitializeWidgets() {
827 827
828 // Setup Dock button 828 // Setup Dock button
829 dock_status_button = new QPushButton(); 829 dock_status_button = new QPushButton();
830 dock_status_button->setObjectName(QStringLiteral("TogglableStatusBarButton")); 830 dock_status_button->setObjectName(QStringLiteral("DockingStatusBarButton"));
831 dock_status_button->setFocusPolicy(Qt::NoFocus); 831 dock_status_button->setFocusPolicy(Qt::NoFocus);
832 connect(dock_status_button, &QPushButton::clicked, this, &GMainWindow::OnToggleDockedMode); 832 connect(dock_status_button, &QPushButton::clicked, this, &GMainWindow::OnToggleDockedMode);
833 dock_status_button->setText(tr("DOCK"));
834 dock_status_button->setCheckable(true); 833 dock_status_button->setCheckable(true);
835 dock_status_button->setChecked(Settings::values.use_docked_mode.GetValue()); 834 UpdateDockedButton();
836 statusBar()->insertPermanentWidget(0, dock_status_button); 835 statusBar()->insertPermanentWidget(0, dock_status_button);
837 836
838 gpu_accuracy_button = new QPushButton(); 837 gpu_accuracy_button = new QPushButton();
@@ -2858,7 +2857,7 @@ void GMainWindow::OnToggleDockedMode() {
2858 } 2857 }
2859 2858
2860 Settings::values.use_docked_mode.SetValue(!is_docked); 2859 Settings::values.use_docked_mode.SetValue(!is_docked);
2861 dock_status_button->setChecked(!is_docked); 2860 UpdateDockedButton();
2862 OnDockedModeChanged(is_docked, !is_docked, *system); 2861 OnDockedModeChanged(is_docked, !is_docked, *system);
2863} 2862}
2864 2863
@@ -3224,6 +3223,12 @@ void GMainWindow::UpdateGPUAccuracyButton() {
3224 } 3223 }
3225} 3224}
3226 3225
3226void GMainWindow::UpdateDockedButton() {
3227 const bool is_docked = Settings::values.use_docked_mode.GetValue();
3228 dock_status_button->setChecked(is_docked);
3229 dock_status_button->setText(is_docked ? tr("DOCKED") : tr("HANDHELD"));
3230}
3231
3227void GMainWindow::UpdateFilterText() { 3232void GMainWindow::UpdateFilterText() {
3228 const auto filter = Settings::values.scaling_filter.GetValue(); 3233 const auto filter = Settings::values.scaling_filter.GetValue();
3229 switch (filter) { 3234 switch (filter) {
@@ -3267,10 +3272,10 @@ void GMainWindow::UpdateAAText() {
3267} 3272}
3268 3273
3269void GMainWindow::UpdateStatusButtons() { 3274void GMainWindow::UpdateStatusButtons() {
3270 dock_status_button->setChecked(Settings::values.use_docked_mode.GetValue());
3271 renderer_status_button->setChecked(Settings::values.renderer_backend.GetValue() == 3275 renderer_status_button->setChecked(Settings::values.renderer_backend.GetValue() ==
3272 Settings::RendererBackend::Vulkan); 3276 Settings::RendererBackend::Vulkan);
3273 UpdateGPUAccuracyButton(); 3277 UpdateGPUAccuracyButton();
3278 UpdateDockedButton();
3274 UpdateFilterText(); 3279 UpdateFilterText();
3275 UpdateAAText(); 3280 UpdateAAText();
3276} 3281}
diff --git a/src/yuzu/main.h b/src/yuzu/main.h
index b399e9b01..600647015 100644
--- a/src/yuzu/main.h
+++ b/src/yuzu/main.h
@@ -320,6 +320,7 @@ private:
320 void MigrateConfigFiles(); 320 void MigrateConfigFiles();
321 void UpdateWindowTitle(std::string_view title_name = {}, std::string_view title_version = {}, 321 void UpdateWindowTitle(std::string_view title_name = {}, std::string_view title_version = {},
322 std::string_view gpu_vendor = {}); 322 std::string_view gpu_vendor = {});
323 void UpdateDockedButton();
323 void UpdateFilterText(); 324 void UpdateFilterText();
324 void UpdateAAText(); 325 void UpdateAAText();
325 void UpdateStatusBar(); 326 void UpdateStatusBar();