From 859ad3985273a7b731bd29d413df4c2e8c59fdfa Mon Sep 17 00:00:00 2001 From: ddutchie Date: Sat, 16 Mar 2024 12:44:28 -0400 Subject: [PATCH 01/20] First Pass Loading Screen --- src/suyu/loading_screen.cpp | 8 ++++---- src/suyu/loading_screen.ui | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/suyu/loading_screen.cpp b/src/suyu/loading_screen.cpp index 64f3264bec..31c02dd321 100644 --- a/src/suyu/loading_screen.cpp +++ b/src/suyu/loading_screen.cpp @@ -31,19 +31,19 @@ constexpr char PROGRESSBAR_STYLE_BUILD[] = R"( QProgressBar { background-color: black; border: 2px solid white; - border-radius: 4px; + border-radius: 25px; padding: 2px; } QProgressBar::chunk { - background-color: #ff3c28; + background-color: white; width: 1px; })"; constexpr char PROGRESSBAR_STYLE_COMPLETE[] = R"( QProgressBar { - background-color: #0ab9e6; + background-color: black; border: 2px solid white; - border-radius: 4px; + border-radius: 25px; padding: 2px; } QProgressBar::chunk { diff --git a/src/suyu/loading_screen.ui b/src/suyu/loading_screen.ui index 820b47536e..4396e91473 100644 --- a/src/suyu/loading_screen.ui +++ b/src/suyu/loading_screen.ui @@ -49,6 +49,9 @@ + + false + @@ -140,6 +143,9 @@ font: 75 15pt "Arial"; + + false + background-color: black; From 6a5d65cc1737224e16f636d75ee827c69ac79cea Mon Sep 17 00:00:00 2001 From: ddutchie Date: Sat, 16 Mar 2024 13:14:11 -0400 Subject: [PATCH 02/20] Hide logos change font --- src/suyu/loading_screen.cpp | 6 ++++-- src/suyu/loading_screen.ui | 13 +++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/suyu/loading_screen.cpp b/src/suyu/loading_screen.cpp index 31c02dd321..7912ecafcf 100644 --- a/src/suyu/loading_screen.cpp +++ b/src/suyu/loading_screen.cpp @@ -47,7 +47,7 @@ QProgressBar { padding: 2px; } QProgressBar::chunk { - background-color: #ff3c28; + background-color: #white; })"; LoadingScreen::LoadingScreen(QWidget* parent) @@ -99,7 +99,7 @@ void LoadingScreen::Prepare(Loader::AppLoader& loader) { #ifdef SUYU_QT_MOVIE_MISSING QPixmap map; map.loadFromData(buffer.data(), buffer.size()); - ui->banner->setPixmap(map); + setPixmap(map); #else backing_mem = std::make_unique(reinterpret_cast(buffer.data()), static_cast(buffer.size())); @@ -116,6 +116,8 @@ void LoadingScreen::Prepare(Loader::AppLoader& loader) { map.loadFromData(buffer.data(), static_cast(buffer.size())); ui->logo->setPixmap(map); } + ui->logo->setVisible(false); + ui->banner->setVisible(false); slow_shader_compile_start = false; OnLoadProgress(VideoCore::LoadCallbackStage::Prepare, 0, 0); diff --git a/src/suyu/loading_screen.ui b/src/suyu/loading_screen.ui index 4396e91473..e54c7b8246 100644 --- a/src/suyu/loading_screen.ui +++ b/src/suyu/loading_screen.ui @@ -79,9 +79,18 @@ 0 + + + Ubuntu + 20 + false + true + true + + background-color: black; color: white; -font: 75 20pt "Arial"; +font: 700 20pt "Ubuntu"; Loading Shaders 387 / 1628 @@ -132,7 +141,7 @@ border-radius: 15px; background-color: black; color: white; -font: 75 15pt "Arial"; +font: 700 15pt "Ubuntu"; Estimated Time 5m 4s From 6f85fbc9d485924809f82881a8f430b78066cd4a Mon Sep 17 00:00:00 2001 From: ddutchie Date: Sat, 16 Mar 2024 13:44:05 -0400 Subject: [PATCH 03/20] Tweak Radius, Medium Font --- src/suyu/loading_screen.cpp | 4 ++-- src/suyu/loading_screen.ui | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/suyu/loading_screen.cpp b/src/suyu/loading_screen.cpp index 7912ecafcf..6846ef94f0 100644 --- a/src/suyu/loading_screen.cpp +++ b/src/suyu/loading_screen.cpp @@ -31,7 +31,7 @@ constexpr char PROGRESSBAR_STYLE_BUILD[] = R"( QProgressBar { background-color: black; border: 2px solid white; - border-radius: 25px; + border-radius: 10px; padding: 2px; } QProgressBar::chunk { @@ -43,7 +43,7 @@ constexpr char PROGRESSBAR_STYLE_COMPLETE[] = R"( QProgressBar { background-color: black; border: 2px solid white; - border-radius: 25px; + border-radius: 10px; padding: 2px; } QProgressBar::chunk { diff --git a/src/suyu/loading_screen.ui b/src/suyu/loading_screen.ui index e54c7b8246..a38792198c 100644 --- a/src/suyu/loading_screen.ui +++ b/src/suyu/loading_screen.ui @@ -84,13 +84,13 @@ Ubuntu 20 false - true true + Medium background-color: black; color: white; -font: 700 20pt "Ubuntu"; +font: 500 20pt "Ubuntu"; Loading Shaders 387 / 1628 @@ -116,11 +116,11 @@ font: 700 20pt "Ubuntu"; color: white; border: 2px solid white; outline-color: black; -border-radius: 20px; +border-radius: 10px; } QProgressBar::chunk { background-color: white; -border-radius: 15px; +border-radius: 5px; } @@ -141,7 +141,7 @@ border-radius: 15px; background-color: black; color: white; -font: 700 15pt "Ubuntu"; +font: 500 15pt "Ubuntu"; Estimated Time 5m 4s From 8ff94c91919f9ce3bb71a545c3195e7e7f486674 Mon Sep 17 00:00:00 2001 From: ddutchie Date: Sat, 16 Mar 2024 14:03:19 -0400 Subject: [PATCH 04/20] Fix --- src/suyu/loading_screen.ui | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/suyu/loading_screen.ui b/src/suyu/loading_screen.ui index a38792198c..600743914b 100644 --- a/src/suyu/loading_screen.ui +++ b/src/suyu/loading_screen.ui @@ -79,15 +79,6 @@ 0 - - - Ubuntu - 20 - false - true - Medium - - background-color: black; color: white; font: 500 20pt "Ubuntu"; From 2786311869b52e7b676bcfc3f8d8749685966059 Mon Sep 17 00:00:00 2001 From: ddutchie Date: Sat, 16 Mar 2024 16:58:40 -0400 Subject: [PATCH 05/20] Update loading_screen.ui --- src/suyu/loading_screen.ui | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/suyu/loading_screen.ui b/src/suyu/loading_screen.ui index 600743914b..edbd518710 100644 --- a/src/suyu/loading_screen.ui +++ b/src/suyu/loading_screen.ui @@ -107,11 +107,11 @@ font: 500 20pt "Ubuntu"; color: white; border: 2px solid white; outline-color: black; -border-radius: 10px; +border-radius: 15px; } QProgressBar::chunk { background-color: white; -border-radius: 5px; +border-radius: 10px; } From 8e08fc1ab9f6e9439d84c0b5bbb73bf204392cd5 Mon Sep 17 00:00:00 2001 From: ddutchie Date: Sat, 16 Mar 2024 18:20:42 -0400 Subject: [PATCH 06/20] Add Logo --- src/suyu/loading_screen.ui | 50 +++++++++++++++++++++++++++++++++----- 1 file changed, 44 insertions(+), 6 deletions(-) diff --git a/src/suyu/loading_screen.ui b/src/suyu/loading_screen.ui index edbd518710..2422c63b1c 100644 --- a/src/suyu/loading_screen.ui +++ b/src/suyu/loading_screen.ui @@ -64,7 +64,7 @@ - + 15 @@ -99,19 +99,20 @@ font: 500 20pt "Ubuntu"; 500 - 40 + 20 QProgressBar { -color: white; +background-color: black; border: 2px solid white; -outline-color: black; -border-radius: 15px; +border-radius: 10px; +padding: 2px; } QProgressBar::chunk { background-color: white; -border-radius: 10px; +padding: 2px; +border-radius: 6px; } @@ -125,6 +126,43 @@ border-radius: 10px; + + + + true + + + + 0 + 0 + + + + + 56 + 56 + + + + + + + ../../dist/qt_themes/default/icons/256x256/suyu.png + + + true + + + Qt::AlignCenter + + + 0 + + + -1 + + + From 6737a54cdbee9b28b40cde09f7f4c6b4eaa825e1 Mon Sep 17 00:00:00 2001 From: ddutchie Date: Sat, 16 Mar 2024 18:43:51 -0400 Subject: [PATCH 07/20] Rework Add new Logos --- dist/qt_themes/suyu_assets/Suyu_Logo.png | Bin 0 -> 9284 bytes dist/qt_themes/suyu_assets/Suyu_Name.png | Bin 0 -> 9568 bytes src/suyu/loading_screen.ui | 96 ++++++++++++++--------- 3 files changed, 60 insertions(+), 36 deletions(-) create mode 100755 dist/qt_themes/suyu_assets/Suyu_Logo.png create mode 100755 dist/qt_themes/suyu_assets/Suyu_Name.png diff --git a/dist/qt_themes/suyu_assets/Suyu_Logo.png b/dist/qt_themes/suyu_assets/Suyu_Logo.png new file mode 100755 index 0000000000000000000000000000000000000000..db47afa9bdcc0aecb2cafeea5d99e5c0c75abab6 GIT binary patch literal 9284 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 KMNUMnLSTX``r#4) literal 0 HcmV?d00001 diff --git a/src/suyu/loading_screen.ui b/src/suyu/loading_screen.ui index 2422c63b1c..c5d5526f58 100644 --- a/src/suyu/loading_screen.ui +++ b/src/suyu/loading_screen.ui @@ -47,7 +47,7 @@ 0 - + false @@ -64,14 +64,51 @@ - + 15 QLayout::SetNoConstraint - + + + + true + + + + 0 + 0 + + + + + 16777215 + 65 + + + + + + + ../../dist/qt_themes/suyu_assets/Suyu_Name.png + + + true + + + Qt::AlignCenter + + + 0 + + + -1 + + + + @@ -79,6 +116,12 @@ 0 + + + 16777215 + 50 + + background-color: black; color: white; font: 500 20pt "Ubuntu"; @@ -88,7 +131,7 @@ font: 500 20pt "Ubuntu"; - + @@ -99,7 +142,13 @@ font: 500 20pt "Ubuntu"; 500 - 20 + 30 + + + + + 16777215 + 30 @@ -126,45 +175,20 @@ border-radius: 6px; - - - - true - + + - + 0 0 - 56 - 56 + 16777215 + 40 - - - - - ../../dist/qt_themes/default/icons/256x256/suyu.png - - - true - - - Qt::AlignCenter - - - 0 - - - -1 - - - - - @@ -179,7 +203,7 @@ font: 500 15pt "Ubuntu"; - + false From 59e997ee07d1f817c840573e2e97e2c22eba8208 Mon Sep 17 00:00:00 2001 From: ddutchie Date: Sat, 16 Mar 2024 20:35:22 -0400 Subject: [PATCH 08/20] Revert "Rework Add new Logos" This reverts commit 6737a54cdbee9b28b40cde09f7f4c6b4eaa825e1. --- dist/qt_themes/suyu_assets/Suyu_Logo.png | Bin 9284 -> 0 bytes dist/qt_themes/suyu_assets/Suyu_Name.png | Bin 9568 -> 0 bytes src/suyu/loading_screen.ui | 96 +++++++++-------------- 3 files changed, 36 insertions(+), 60 deletions(-) delete mode 100755 dist/qt_themes/suyu_assets/Suyu_Logo.png delete mode 100755 dist/qt_themes/suyu_assets/Suyu_Name.png diff --git a/dist/qt_themes/suyu_assets/Suyu_Logo.png b/dist/qt_themes/suyu_assets/Suyu_Logo.png deleted file mode 100755 index db47afa9bdcc0aecb2cafeea5d99e5c0c75abab6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9284 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 KMNUMnLSTX``r#4) diff --git a/src/suyu/loading_screen.ui b/src/suyu/loading_screen.ui index c5d5526f58..2422c63b1c 100644 --- a/src/suyu/loading_screen.ui +++ b/src/suyu/loading_screen.ui @@ -47,7 +47,7 @@ 0 - + false @@ -64,51 +64,14 @@ - + 15 QLayout::SetNoConstraint - - - - true - - - - 0 - 0 - - - - - 16777215 - 65 - - - - - - - ../../dist/qt_themes/suyu_assets/Suyu_Name.png - - - true - - - Qt::AlignCenter - - - 0 - - - -1 - - - - + @@ -116,12 +79,6 @@ 0 - - - 16777215 - 50 - - background-color: black; color: white; font: 500 20pt "Ubuntu"; @@ -131,7 +88,7 @@ font: 500 20pt "Ubuntu"; - + @@ -142,13 +99,7 @@ font: 500 20pt "Ubuntu"; 500 - 30 - - - - - 16777215 - 30 + 20 @@ -175,20 +126,45 @@ border-radius: 6px; - - + + + + true + - + 0 0 - 16777215 - 40 + 56 + 56 + + + + + ../../dist/qt_themes/default/icons/256x256/suyu.png + + + true + + + Qt::AlignCenter + + + 0 + + + -1 + + + + + @@ -203,7 +179,7 @@ font: 500 15pt "Ubuntu"; - + false From 5cd903eabd093baab7655be68bcebd5eaff153ce Mon Sep 17 00:00:00 2001 From: ddutchie Date: Sat, 16 Mar 2024 20:35:27 -0400 Subject: [PATCH 09/20] Revert "Add Logo" This reverts commit 8e08fc1ab9f6e9439d84c0b5bbb73bf204392cd5. --- src/suyu/loading_screen.ui | 50 +++++--------------------------------- 1 file changed, 6 insertions(+), 44 deletions(-) diff --git a/src/suyu/loading_screen.ui b/src/suyu/loading_screen.ui index 2422c63b1c..edbd518710 100644 --- a/src/suyu/loading_screen.ui +++ b/src/suyu/loading_screen.ui @@ -64,7 +64,7 @@ - + 15 @@ -99,20 +99,19 @@ font: 500 20pt "Ubuntu"; 500 - 20 + 40 QProgressBar { -background-color: black; +color: white; border: 2px solid white; -border-radius: 10px; -padding: 2px; +outline-color: black; +border-radius: 15px; } QProgressBar::chunk { background-color: white; -padding: 2px; -border-radius: 6px; +border-radius: 10px; } @@ -126,43 +125,6 @@ border-radius: 6px; - - - - true - - - - 0 - 0 - - - - - 56 - 56 - - - - - - - ../../dist/qt_themes/default/icons/256x256/suyu.png - - - true - - - Qt::AlignCenter - - - 0 - - - -1 - - - From b96fcd137013e0bf05d0e9634e1556584f1dfcb8 Mon Sep 17 00:00:00 2001 From: ddutchie Date: Sat, 16 Mar 2024 20:40:51 -0400 Subject: [PATCH 10/20] Cleanup --- src/suyu/loading_screen.cpp | 1 - src/suyu/loading_screen.ui | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/suyu/loading_screen.cpp b/src/suyu/loading_screen.cpp index 6846ef94f0..116e4bccd7 100644 --- a/src/suyu/loading_screen.cpp +++ b/src/suyu/loading_screen.cpp @@ -36,7 +36,6 @@ QProgressBar { } QProgressBar::chunk { background-color: white; - width: 1px; })"; constexpr char PROGRESSBAR_STYLE_COMPLETE[] = R"( diff --git a/src/suyu/loading_screen.ui b/src/suyu/loading_screen.ui index edbd518710..bf409e8174 100644 --- a/src/suyu/loading_screen.ui +++ b/src/suyu/loading_screen.ui @@ -99,19 +99,19 @@ font: 500 20pt "Ubuntu"; 500 - 40 + 30 QProgressBar { -color: white; +background-color: black; border: 2px solid white; -outline-color: black; -border-radius: 15px; +border-radius: 10px; +padding: 2px; } QProgressBar::chunk { background-color: white; -border-radius: 10px; +border-radius: 6px; } From f43f50c1c51a2eecb44f5df58a536f66c7d5a916 Mon Sep 17 00:00:00 2001 From: ddutchie Date: Sat, 16 Mar 2024 21:43:14 -0400 Subject: [PATCH 11/20] Update loading_screen.cpp --- src/suyu/loading_screen.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/suyu/loading_screen.cpp b/src/suyu/loading_screen.cpp index 116e4bccd7..a55d8516b1 100644 --- a/src/suyu/loading_screen.cpp +++ b/src/suyu/loading_screen.cpp @@ -36,6 +36,7 @@ QProgressBar { } QProgressBar::chunk { background-color: white; + border-radius: 6px; })"; constexpr char PROGRESSBAR_STYLE_COMPLETE[] = R"( @@ -46,7 +47,8 @@ QProgressBar { padding: 2px; } QProgressBar::chunk { - background-color: #white; + background-color: white; + border-radius: 6px; })"; LoadingScreen::LoadingScreen(QWidget* parent) From ac4c2702d758bebf7c4fec00964124191ef7d9e7 Mon Sep 17 00:00:00 2001 From: ddutchie Date: Sat, 16 Mar 2024 22:08:42 -0400 Subject: [PATCH 12/20] Loader --- src/suyu/loading_screen.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/suyu/loading_screen.cpp b/src/suyu/loading_screen.cpp index a55d8516b1..341d046dba 100644 --- a/src/suyu/loading_screen.cpp +++ b/src/suyu/loading_screen.cpp @@ -47,7 +47,7 @@ QProgressBar { padding: 2px; } QProgressBar::chunk { - background-color: white; + background-color: #white; border-radius: 6px; })"; From d6d0505f1b0f750c68fda76a53d7ffa9fd5686b5 Mon Sep 17 00:00:00 2001 From: ddutchie Date: Sun, 17 Mar 2024 06:30:42 -0400 Subject: [PATCH 13/20] Update loading_screen.cpp --- src/suyu/loading_screen.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/suyu/loading_screen.cpp b/src/suyu/loading_screen.cpp index 341d046dba..227e5d1307 100644 --- a/src/suyu/loading_screen.cpp +++ b/src/suyu/loading_screen.cpp @@ -47,8 +47,8 @@ QProgressBar { padding: 2px; } QProgressBar::chunk { - background-color: #white; - border-radius: 6px; + background-color: white; + width: 1px; })"; LoadingScreen::LoadingScreen(QWidget* parent) From 91e22ebd819df0c9d48d43d356632c9f310df354 Mon Sep 17 00:00:00 2001 From: ddutchie Date: Sun, 17 Mar 2024 16:00:02 -0400 Subject: [PATCH 14/20] Pop of Color, Add 800p --- src/suyu/loading_screen.cpp | 2 -- src/suyu/loading_screen.ui | 8 +++++++- src/suyu/main.cpp | 6 ++++++ src/suyu/main.ui | 12 ++++++++++-- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/src/suyu/loading_screen.cpp b/src/suyu/loading_screen.cpp index 227e5d1307..4b518d8333 100644 --- a/src/suyu/loading_screen.cpp +++ b/src/suyu/loading_screen.cpp @@ -47,8 +47,6 @@ QProgressBar { padding: 2px; } QProgressBar::chunk { - background-color: white; - width: 1px; })"; LoadingScreen::LoadingScreen(QWidget* parent) diff --git a/src/suyu/loading_screen.ui b/src/suyu/loading_screen.ui index bf409e8174..b3dcdc35b9 100644 --- a/src/suyu/loading_screen.ui +++ b/src/suyu/loading_screen.ui @@ -102,6 +102,12 @@ font: 500 20pt "Ubuntu"; 30 + + + 16777215 + 30 + + QProgressBar { background-color: black; @@ -110,7 +116,7 @@ border-radius: 10px; padding: 2px; } QProgressBar::chunk { -background-color: white; +background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(98, 160, 234, 255), stop:1 rgba(237, 51, 59, 255)); border-radius: 6px; } diff --git a/src/suyu/main.cpp b/src/suyu/main.cpp index 4b9265febf..535eb050de 100644 --- a/src/suyu/main.cpp +++ b/src/suyu/main.cpp @@ -1535,9 +1535,11 @@ void GMainWindow::ConnectMenuEvents() { connect_menu(ui->action_Show_Folders_In_List, &GMainWindow::OnToggleFoldersInList); connect_menu(ui->action_Reset_Window_Size_720, &GMainWindow::ResetWindowSize720); + connect_menu(ui->action_Reset_Window_Size_800, &GMainWindow::ResetWindowSize800); connect_menu(ui->action_Reset_Window_Size_900, &GMainWindow::ResetWindowSize900); connect_menu(ui->action_Reset_Window_Size_1080, &GMainWindow::ResetWindowSize1080); ui->menu_Reset_Window_Size->addActions({ui->action_Reset_Window_Size_720, + ui->action_Reset_Window_Size_800, ui->action_Reset_Window_Size_900, ui->action_Reset_Window_Size_1080}); @@ -3530,6 +3532,10 @@ void GMainWindow::ResetWindowSize720() { ResetWindowSize(Layout::ScreenUndocked::Width, Layout::ScreenUndocked::Height); } +void GMainWindow::ResetWindowSize800() { + ResetWindowSize(1280U, 800U); +} + void GMainWindow::ResetWindowSize900() { ResetWindowSize(1600U, 900U); } diff --git a/src/suyu/main.ui b/src/suyu/main.ui index fece5f7069..283c26c4e7 100644 --- a/src/suyu/main.ui +++ b/src/suyu/main.ui @@ -45,7 +45,7 @@ 0 0 1280 - 21 + 22 @@ -102,6 +102,14 @@ Reset Window Size to 720p + + + + Reset Window Size to &800p + + + Reset Window Size to 800p + @@ -124,7 +132,7 @@ - + From 28ecb35260aa1b309d8cc9a58f0acaacf21104cd Mon Sep 17 00:00:00 2001 From: ddutchie Date: Sun, 17 Mar 2024 16:05:05 -0400 Subject: [PATCH 15/20] Clang Format --- src/suyu/main.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/suyu/main.cpp b/src/suyu/main.cpp index 535eb050de..357fdce12d 100644 --- a/src/suyu/main.cpp +++ b/src/suyu/main.cpp @@ -1538,10 +1538,9 @@ void GMainWindow::ConnectMenuEvents() { connect_menu(ui->action_Reset_Window_Size_800, &GMainWindow::ResetWindowSize800); connect_menu(ui->action_Reset_Window_Size_900, &GMainWindow::ResetWindowSize900); connect_menu(ui->action_Reset_Window_Size_1080, &GMainWindow::ResetWindowSize1080); - ui->menu_Reset_Window_Size->addActions({ui->action_Reset_Window_Size_720, - ui->action_Reset_Window_Size_800, - ui->action_Reset_Window_Size_900, - ui->action_Reset_Window_Size_1080}); + ui->menu_Reset_Window_Size->addActions( + {ui->action_Reset_Window_Size_720, ui->action_Reset_Window_Size_800, + ui->action_Reset_Window_Size_900, ui->action_Reset_Window_Size_1080}); // Multiplayer connect(ui->action_View_Lobby, &QAction::triggered, multiplayer_state, From 9d9a57a85ae7d5ba61feaf57ff32a8c209fd1fe0 Mon Sep 17 00:00:00 2001 From: ddutchie Date: Sun, 17 Mar 2024 18:02:11 -0400 Subject: [PATCH 16/20] Add method to main.h --- src/suyu/main.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/suyu/main.h b/src/suyu/main.h index 7fa28477a7..04fb093555 100644 --- a/src/suyu/main.h +++ b/src/suyu/main.h @@ -393,6 +393,7 @@ private slots: void ToggleWindowMode(); void ResetWindowSize(u32 width, u32 height); void ResetWindowSize720(); + void ResetWindowSize800(); void ResetWindowSize900(); void ResetWindowSize1080(); void OnAlbum(); From 69cc6e9b6e745fbfb1e550adc8285ecd3040380b Mon Sep 17 00:00:00 2001 From: ddutchie Date: Mon, 18 Mar 2024 07:59:51 -0400 Subject: [PATCH 17/20] Add color --- src/suyu/loading_screen.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/suyu/loading_screen.cpp b/src/suyu/loading_screen.cpp index 4b518d8333..05a88df8b8 100644 --- a/src/suyu/loading_screen.cpp +++ b/src/suyu/loading_screen.cpp @@ -35,7 +35,7 @@ QProgressBar { padding: 2px; } QProgressBar::chunk { - background-color: white; + background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(98, 160, 234, 255), stop:1 rgba(237, 51, 59, 255)); border-radius: 6px; })"; @@ -44,7 +44,7 @@ QProgressBar { background-color: black; border: 2px solid white; border-radius: 10px; - padding: 2px; + padding: 4px; } QProgressBar::chunk { })"; From c6feb95d8d9239947a28e1d5bb69402391dde4aa Mon Sep 17 00:00:00 2001 From: ddutchie Date: Mon, 18 Mar 2024 15:27:32 -0400 Subject: [PATCH 18/20] Update main.cpp --- src/suyu/main.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/suyu/main.cpp b/src/suyu/main.cpp index 357fdce12d..700a1d5f88 100644 --- a/src/suyu/main.cpp +++ b/src/suyu/main.cpp @@ -3532,7 +3532,11 @@ void GMainWindow::ResetWindowSize720() { } void GMainWindow::ResetWindowSize800() { - ResetWindowSize(1280U, 800U); + if (!ui->action_Single_Window_Mode->isChecked()) { + render_window->resize(1280, 800); + } else { + resize(1280, 800); + } } void GMainWindow::ResetWindowSize900() { From e3ad2bd629007a636cf793928f9efc7cf0f3755f Mon Sep 17 00:00:00 2001 From: ddutchie Date: Tue, 19 Mar 2024 14:08:44 -0400 Subject: [PATCH 19/20] Tag --- .gitlab-ci.yml | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ff4469c5ff..2e67f45b8d 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,22 +1,6 @@ stages: - format - build - -variables: - # https://docs.gitlab.com/ee/ci/runners/configure_runners.html - TRANSFER_METER_FREQUENCY: "2s" - ARTIFACT_COMPRESSION_LEVEL: "fast" - CACHE_COMPRESSION_LEVEL: "fastest" - CACHE_REQUEST_TIMEOUT: 5 - # Use FASTZIP for faster compression in cache and artifacts - # https://docs.gitlab.com/runner/configuration/feature-flags.html#available-feature-flags - FF_USE_FASTZIP: true - - # Our Variables - CACHE_DIR: "$CI_PROJECT_DIR/ccache" - CCACHE_DIR: $CACHE_DIR - - #CLANG FORMAT - CHECKS CODE FOR FORMATTING ISSUES clang-format: stage: format @@ -32,20 +16,11 @@ clang-format: # - Windows - Parallelized - Format - #LINUX BUILD - BUILDS LINUX APPIMAGE build-linux: stage: build image: suyuemu/cibuild:linux-x64 resource_group: linux-ci - cache: - key: "$CI_COMMIT_REF_NAME-ccache" - paths: - - $CACHE_DIR - before_script: - - mkdir -p $CACHE_DIR - - chmod -R 777 $CACHE_DIR - - ls -la $CACHE_DIR variables: GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_DEPTH: 1 @@ -59,7 +34,6 @@ build-linux: tags: - Linux - Parallelized - #ANDROID BUILD - BUILDS APK android: stage: build @@ -78,6 +52,5 @@ android: paths: - artifacts/* tags: - - Linux + - Android - Parallelized - From 86829beb9d24af4878196f196f18c0e18aa10142 Mon Sep 17 00:00:00 2001 From: ddutchie Date: Tue, 19 Mar 2024 14:17:39 -0400 Subject: [PATCH 20/20] Update Docker Script --- .ci/scripts/linux/docker.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/.ci/scripts/linux/docker.sh b/.ci/scripts/linux/docker.sh index b6b8efeea4..7a734a08d9 100755 --- a/.ci/scripts/linux/docker.sh +++ b/.ci/scripts/linux/docker.sh @@ -12,8 +12,6 @@ mkdir build || true && cd build cmake .. \ -DBoost_USE_STATIC_LIBS=ON \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DSUYU_USE_PRECOMPILED_HEADERS=OFF \ - -DDYNARMIC_USE_PRECOMPILED_HEADERS=OFF \ -DCMAKE_CXX_FLAGS="-march=x86-64-v2" \ -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ \ -DCMAKE_C_COMPILER=/usr/lib/ccache/gcc \ @@ -26,7 +24,6 @@ cmake .. \ -DSUYU_USE_BUNDLED_FFMPEG=ON \ -DSUYU_ENABLE_LTO=ON \ -DSUYU_CRASH_DUMPS=ON \ - -DSUYU_USE_FASTER_LD=ON \ -GNinja ninja