Revert "fixes clang format introduced by !193 "

This reverts commit f7b4672492
fixes clang format introduced by !193
2025-12-08 13:52:08 -06:00 · 2024-03-21 11:39:09 +00:00 · 2024-03-21 19:32:57 +08:00
7 changed files with 51 additions and 52 deletions
--- a/.ci/scripts/linux/docker.sh
+++ b/.ci/scripts/linux/docker.sh
@@ -12,6 +12,8 @@ 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 \
@@ -24,6 +26,7 @@ cmake .. \
      -DSUYU_USE_BUNDLED_FFMPEG=ON \
      -DSUYU_ENABLE_LTO=ON \
      -DSUYU_CRASH_DUMPS=ON \
+      -DSUYU_USE_FASTER_LD=ON \
      -GNinja

 ninja
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,22 @@
 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
@@ -16,11 +32,20 @@ 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
@@ -34,6 +59,7 @@ build-linux:
  tags:
    - Linux
    - Parallelized
+
 #ANDROID BUILD - BUILDS APK
 android:
  stage: build
@@ -54,3 +80,4 @@ android:
  tags:
    - Android
    - Parallelized
+
--- a/src/suyu/loading_screen.cpp
+++ b/src/suyu/loading_screen.cpp
@@ -31,22 +31,23 @@ constexpr char PROGRESSBAR_STYLE_BUILD[] = R"(
 QProgressBar {
  background-color: black;
  border: 2px solid white;
-  border-radius: 10px;
+  border-radius: 4px;
  padding: 2px;
 }
 QProgressBar::chunk {
-  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;
+  background-color: #ff3c28;
+  width: 1px;
 })";

 constexpr char PROGRESSBAR_STYLE_COMPLETE[] = R"(
 QProgressBar {
-  background-color: black;
+  background-color: #0ab9e6;
  border: 2px solid white;
-  border-radius: 10px;
-  padding: 4px;
+  border-radius: 4px;
+  padding: 2px;
 }
 QProgressBar::chunk {
+  background-color: #ff3c28;
 })";

 LoadingScreen::LoadingScreen(QWidget* parent)
@@ -98,7 +99,7 @@ void LoadingScreen::Prepare(Loader::AppLoader& loader) {
 #ifdef SUYU_QT_MOVIE_MISSING
        QPixmap map;
        map.loadFromData(buffer.data(), buffer.size());
-        setPixmap(map);
+        ui->banner->setPixmap(map);
 #else
        backing_mem = std::make_unique<QByteArray>(reinterpret_cast<char*>(buffer.data()),
                                                   static_cast<int>(buffer.size()));
@@ -115,8 +116,6 @@ void LoadingScreen::Prepare(Loader::AppLoader& loader) {
        map.loadFromData(buffer.data(), static_cast<uint>(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);
--- a/src/suyu/loading_screen.ui
+++ b/src/suyu/loading_screen.ui
@@ -49,9 +49,6 @@
      </property>
      <item alignment="Qt::AlignLeft|Qt::AlignTop">
       <widget class="QLabel" name="logo">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
        <property name="text">
         <string/>
        </property>
@@ -81,7 +78,7 @@
          </property>
          <property name="styleSheet">
           <string notr="true">background-color: black; color: white;
-font: 500 20pt &quot;Ubuntu&quot;;</string>
+font: 75 20pt &quot;Arial&quot;;</string>
          </property>
          <property name="text">
           <string>Loading Shaders 387 / 1628</string>
@@ -99,25 +96,19 @@ font: 500 20pt &quot;Ubuntu&quot;;</string>
          <property name="minimumSize">
           <size>
            <width>500</width>
-            <height>30</height>
-           </size>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16777215</width>
-            <height>30</height>
+            <height>40</height>
           </size>
          </property>
          <property name="styleSheet">
           <string notr="true">QProgressBar {
-background-color: black;
+color: white;
 border: 2px solid white;
-border-radius: 10px;
-padding: 2px;
+outline-color: black;
+border-radius: 20px;
 }
 QProgressBar::chunk {
-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;
+background-color: white;
+border-radius: 15px;
 }</string>
          </property>
          <property name="value">
@@ -138,7 +129,7 @@ border-radius: 6px;
          </property>
          <property name="styleSheet">
           <string notr="true">background-color: black; color: white;
-font: 500 15pt &quot;Ubuntu&quot;;</string>
+font: 75 15pt &quot;Arial&quot;;</string>
          </property>
          <property name="text">
           <string>Estimated Time 5m 4s</string>
@@ -149,9 +140,6 @@ font: 500 15pt &quot;Ubuntu&quot;;</string>
      </item>
      <item alignment="Qt::AlignRight|Qt::AlignBottom">
       <widget class="QLabel" name="banner">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
        <property name="styleSheet">
         <string notr="true">background-color: black;</string>
        </property>
--- a/src/suyu/main.cpp
+++ b/src/suyu/main.cpp
@@ -1535,12 +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});
+    ui->menu_Reset_Window_Size->addActions({ui->action_Reset_Window_Size_720,
+                                            ui->action_Reset_Window_Size_900,
+                                            ui->action_Reset_Window_Size_1080});

    // Multiplayer
    connect(ui->action_View_Lobby, &QAction::triggered, multiplayer_state,
@@ -3531,14 +3530,6 @@ void GMainWindow::ResetWindowSize720() {
    ResetWindowSize(Layout::ScreenUndocked::Width, Layout::ScreenUndocked::Height);
 }

-void GMainWindow::ResetWindowSize800() {
-    if (!ui->action_Single_Window_Mode->isChecked()) {
-        render_window->resize(1280, 800);
-    } else {
-        resize(1280, 800);
-    }
-}
-
 void GMainWindow::ResetWindowSize900() {
    ResetWindowSize(1600U, 900U);
 }
--- a/src/suyu/main.h
+++ b/src/suyu/main.h
@@ -393,7 +393,6 @@ private slots:
    void ToggleWindowMode();
    void ResetWindowSize(u32 width, u32 height);
    void ResetWindowSize720();
-    void ResetWindowSize800();
    void ResetWindowSize900();
    void ResetWindowSize1080();
    void OnAlbum();
--- a/src/suyu/main.ui
+++ b/src/suyu/main.ui
@@ -45,7 +45,7 @@
     <x>0</x>
     <y>0</y>
     <width>1280</width>
-     <height>22</height>
+     <height>21</height>
    </rect>
   </property>
   <widget class="QMenu" name="menu_File">
@@ -102,14 +102,6 @@
     <property name="iconText">
      <string>Reset Window Size to 720p</string>
     </property>
-    </action>
-        <action name="action_Reset_Window_Size_800">
-     <property name="text">
-      <string>Reset Window Size to &amp;800p</string>
-     </property>
-     <property name="iconText">
-      <string>Reset Window Size to 800p</string>
-     </property>
    </action>
    <action name="action_Reset_Window_Size_900">
     <property name="text">
@@ -132,7 +124,7 @@
    <addaction name="action_Display_Dock_Widget_Headers"/>
    <addaction name="action_Show_Filter_Bar"/>
    <addaction name="action_Show_Status_Bar"/>
-    <addaction name="action_Show_Folders_In_List"/>
+    <addaction name="action_Show_Folders_In_List" />
    <addaction name="separator"/>
    <addaction name="menu_Reset_Window_Size"/>
    <addaction name="menu_View_Debugging"/>
Author	SHA1	Message	Date
Crimson Hawk	3e6574b6b3	Revert "fixes clang format introduced by !193 " This reverts commit `f7b4672492`	2024-03-21 11:39:09 +00:00
Crimson-Hawk	f7b4672492	fixes clang format introduced by !193	2024-03-21 19:32:57 +08:00