From 4adc88d67032034a4f6952f6919d9b5336e7cab5 Mon Sep 17 00:00:00 2001
From: pineappleEA <pineaea@gmail.com>
Date: Sun, 14 Feb 2021 10:10:28 +0100
Subject: [PATCH] early-access version 1459

---
 README.md                                      |   2 +-
 dist/qt_themes/colorful_dark/icons/index.theme |   2 +-
 .../colorful_midnight_blue/icons/index.theme   |   2 +-
 .../qdarkstyle_midnight_blue/style.qss         |   4 ----
 dist/yuzu.bmp                                  | Bin 0 -> 262282 bytes
 src/video_core/shader/async_shaders.cpp        |   1 +
 src/yuzu/CMakeLists.txt                        |   1 +
 src/yuzu/main.cpp                              |  10 +++-------
 src/yuzu/main.ui                               |   8 +++++---
 src/yuzu/yuzu.qrc                              |   5 +++++
 src/yuzu_cmd/CMakeLists.txt                    |  13 +++++++++++++
 src/yuzu_cmd/emu_window/emu_window_sdl2.cpp    |  17 +++++++++++++++++
 src/yuzu_cmd/emu_window/emu_window_sdl2.h      |   3 +++
 src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp |   2 ++
 src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp |   2 ++
 15 files changed, 55 insertions(+), 17 deletions(-)
 create mode 100755 dist/yuzu.bmp
 create mode 100755 src/yuzu/yuzu.qrc

diff --git a/README.md b/README.md
index 80adb89fe..e8d35fd6d 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 yuzu emulator early access
 =============
 
-This is the source code for early-access 1458.
+This is the source code for early-access 1459.
 
 ## Legal Notice
 
diff --git a/dist/qt_themes/colorful_dark/icons/index.theme b/dist/qt_themes/colorful_dark/icons/index.theme
index 94d5ae8aa..19dc0369a 100755
--- a/dist/qt_themes/colorful_dark/icons/index.theme
+++ b/dist/qt_themes/colorful_dark/icons/index.theme
@@ -1,7 +1,7 @@
 [Icon Theme]
 Name=colorful_dark
 Comment=Colorful theme (Dark style)
-Inherits=default
+Inherits=colorful
 Directories=16x16
  
 [16x16]
diff --git a/dist/qt_themes/colorful_midnight_blue/icons/index.theme b/dist/qt_themes/colorful_midnight_blue/icons/index.theme
index e23bfe6f9..dcb2c50d6 100755
--- a/dist/qt_themes/colorful_midnight_blue/icons/index.theme
+++ b/dist/qt_themes/colorful_midnight_blue/icons/index.theme
@@ -1,7 +1,7 @@
 [Icon Theme]
 Name=colorful_midnight_blue
 Comment=Colorful theme (Midnight Blue style)
-Inherits=default
+Inherits=colorful
 Directories=16x16
 
 [16x16]
diff --git a/dist/qt_themes/qdarkstyle_midnight_blue/style.qss b/dist/qt_themes/qdarkstyle_midnight_blue/style.qss
index 70e540b06..a64037455 100755
--- a/dist/qt_themes/qdarkstyle_midnight_blue/style.qss
+++ b/dist/qt_themes/qdarkstyle_midnight_blue/style.qss
@@ -1257,10 +1257,6 @@ QComboBox::item:alternate {
   background: #19232D;
 }
 
-QComboBox::item:checked {
-  font-weight: bold;
-}
-
 QComboBox::item:selected {
   border: 0px solid transparent;
 }
diff --git a/dist/yuzu.bmp b/dist/yuzu.bmp
new file mode 100755
index 0000000000000000000000000000000000000000..66f2f696f015f4c8e68c4859e8a1bda57fd5c05c
GIT binary patch
literal 262282
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
NVc8kZvVRh${~w?hDv1C9

literal 0
HcmV?d00001

diff --git a/src/video_core/shader/async_shaders.cpp b/src/video_core/shader/async_shaders.cpp
index 3b40db9bc..02adcf9c7 100755
--- a/src/video_core/shader/async_shaders.cpp
+++ b/src/video_core/shader/async_shaders.cpp
@@ -64,6 +64,7 @@ void AsyncShaders::FreeWorkers() {
 
 void AsyncShaders::KillWorkers() {
     is_thread_exiting.store(true);
+    cv.notify_all();
     for (auto& thread : worker_threads) {
         thread.detach();
     }
diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt
index fb9967c8f..b025ced1c 100755
--- a/src/yuzu/CMakeLists.txt
+++ b/src/yuzu/CMakeLists.txt
@@ -151,6 +151,7 @@ add_executable(yuzu
     util/util.h
     compatdb.cpp
     compatdb.h
+    yuzu.qrc
     yuzu.rc
 )
 
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 28a52a56c..0ba7c07cc 100755
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -2770,7 +2770,7 @@ void GMainWindow::OnReinitializeKeys(ReinitializeKeyBehavior behavior) {
                     .arg(errors));
         }
 
-        QProgressDialog prog;
+        QProgressDialog prog(this);
         prog.setRange(0, 0);
         prog.setLabelText(tr("Deriving keys...\nThis may take up to a minute depending \non your "
                              "system's performance."));
@@ -2952,7 +2952,7 @@ void GMainWindow::filterBarSetChecked(bool state) {
 }
 
 void GMainWindow::UpdateUITheme() {
-    const QString default_icons = QStringLiteral(":/icons/default");
+    const QString default_icons = QStringLiteral("default");
     const QString& current_theme = UISettings::values.theme;
     const bool is_default_theme = current_theme == QString::fromUtf8(UISettings::themes[0].second);
     QStringList theme_paths(default_theme_paths);
@@ -2968,7 +2968,6 @@ void GMainWindow::UpdateUITheme() {
             qApp->setStyleSheet({});
             setStyleSheet({});
         }
-        theme_paths.append(default_icons);
         QIcon::setThemeName(default_icons);
     } else {
         const QString theme_uri(QLatin1Char{':'} + current_theme + QStringLiteral("/style.qss"));
@@ -2980,10 +2979,7 @@ void GMainWindow::UpdateUITheme() {
         } else {
             LOG_ERROR(Frontend, "Unable to set style, stylesheet file not found");
         }
-
-        const QString theme_name = QStringLiteral(":/icons/") + current_theme;
-        theme_paths.append({default_icons, theme_name});
-        QIcon::setThemeName(theme_name);
+        QIcon::setThemeName(current_theme);
     }
 
     QIcon::setThemeSearchPaths(theme_paths);
diff --git a/src/yuzu/main.ui b/src/yuzu/main.ui
index e2ad5baf6..048870687 100755
--- a/src/yuzu/main.ui
+++ b/src/yuzu/main.ui
@@ -14,8 +14,8 @@
    <string>yuzu</string>
   </property>
   <property name="windowIcon">
-   <iconset>
-    <normaloff>../dist/yuzu.ico</normaloff>../dist/yuzu.ico</iconset>
+   <iconset resource="yuzu.qrc">
+    <normaloff>:/img/yuzu.ico</normaloff>:/img/yuzu.ico</iconset>
   </property>
   <property name="tabShape">
    <enum>QTabWidget::Rounded</enum>
@@ -303,6 +303,8 @@
    </property>
   </action>
  </widget>
- <resources/>
+ <resources>
+  <include location="yuzu.qrc"/>
+ </resources>
  <connections/>
 </ui>
diff --git a/src/yuzu/yuzu.qrc b/src/yuzu/yuzu.qrc
new file mode 100755
index 000000000..5733cac98
--- /dev/null
+++ b/src/yuzu/yuzu.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/img">
+        <file alias="yuzu.ico">../../dist/yuzu.ico</file>
+    </qresource>
+</RCC>
diff --git a/src/yuzu_cmd/CMakeLists.txt b/src/yuzu_cmd/CMakeLists.txt
index 0b3f2cb54..8461f8896 100755
--- a/src/yuzu_cmd/CMakeLists.txt
+++ b/src/yuzu_cmd/CMakeLists.txt
@@ -1,5 +1,15 @@
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)
 
+function(create_resource file output filename)
+    # Read hex data from file
+    file(READ ${file} filedata HEX)
+    # Convert hex data for C compatibility
+    string(REGEX REPLACE "([0-9a-f][0-9a-f])" "0x\\1," filedata ${filedata})
+    # Write data to output file
+    set(RESOURCES_DIR "${PROJECT_BINARY_DIR}/dist" PARENT_SCOPE)
+    file(WRITE "${PROJECT_BINARY_DIR}/dist/${output}" "const unsigned char ${filename}[] = {${filedata}};\nconst unsigned ${filename}_size = sizeof(${filename});\n")
+endfunction()
+
 add_executable(yuzu-cmd
     config.cpp
     config.h
@@ -24,6 +34,9 @@ if (MSVC)
 endif()
 target_link_libraries(yuzu-cmd PRIVATE ${PLATFORM_LIBRARIES} SDL2 Threads::Threads)
 
+create_resource("../../dist/yuzu.bmp" "yuzu_cmd/yuzu_icon.h" "yuzu_icon")
+target_include_directories(yuzu-cmd PRIVATE ${RESOURCES_DIR})
+
 target_include_directories(yuzu-cmd PRIVATE ../../externals/Vulkan-Headers/include)
 
 if(UNIX AND NOT APPLE)
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
index 39841aa28..7e391ab89 100755
--- a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
+++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp
@@ -12,6 +12,7 @@
 #include "input_common/mouse/mouse_input.h"
 #include "input_common/sdl/sdl.h"
 #include "yuzu_cmd/emu_window/emu_window_sdl2.h"
+#include "yuzu_cmd/yuzu_icon.h"
 
 EmuWindow_SDL2::EmuWindow_SDL2(InputCommon::InputSubsystem* input_subsystem_)
     : input_subsystem{input_subsystem_} {
@@ -194,6 +195,22 @@ void EmuWindow_SDL2::WaitEvent() {
     }
 }
 
+void EmuWindow_SDL2::SetWindowIcon() {
+    SDL_RWops* const yuzu_icon_stream = SDL_RWFromConstMem((void*)yuzu_icon, yuzu_icon_size);
+    if (yuzu_icon_stream == nullptr) {
+        LOG_WARNING(Frontend, "Failed to create yuzu icon stream.");
+        return;
+    }
+    SDL_Surface* const window_icon = SDL_LoadBMP_RW(yuzu_icon_stream, 1);
+    if (window_icon == nullptr) {
+        LOG_WARNING(Frontend, "Failed to read BMP from stream.");
+        return;
+    }
+    // The icon is attached to the window pointer
+    SDL_SetWindowIcon(render_window, window_icon);
+    SDL_FreeSurface(window_icon);
+}
+
 void EmuWindow_SDL2::OnMinimalClientAreaChangeRequest(std::pair<unsigned, unsigned> minimal_size) {
     SDL_SetWindowMinimumSize(render_window, minimal_size.first, minimal_size.second);
 }
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.h b/src/yuzu_cmd/emu_window/emu_window_sdl2.h
index a93141240..51a12a6a9 100755
--- a/src/yuzu_cmd/emu_window/emu_window_sdl2.h
+++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.h
@@ -32,6 +32,9 @@ public:
     /// Wait for the next event on the main thread.
     void WaitEvent();
 
+    // Sets the window icon from yuzu.bmp
+    void SetWindowIcon();
+
 protected:
     /// Called by WaitEvent when a key is pressed or released.
     void OnKeyEvent(int key, u8 state);
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp
index deddea9ee..a02485c14 100755
--- a/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp
+++ b/src/yuzu_cmd/emu_window/emu_window_sdl2_gl.cpp
@@ -107,6 +107,8 @@ EmuWindow_SDL2_GL::EmuWindow_SDL2_GL(InputCommon::InputSubsystem* input_subsyste
     dummy_window = SDL_CreateWindow(NULL, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 0, 0,
                                     SDL_WINDOW_HIDDEN | SDL_WINDOW_OPENGL);
 
+    SetWindowIcon();
+
     if (fullscreen) {
         Fullscreen();
     }
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp
index 3ba657c00..6f9b00461 100755
--- a/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp
+++ b/src/yuzu_cmd/emu_window/emu_window_sdl2_vk.cpp
@@ -35,6 +35,8 @@ EmuWindow_SDL2_VK::EmuWindow_SDL2_VK(InputCommon::InputSubsystem* input_subsyste
         std::exit(EXIT_FAILURE);
     }
 
+    SetWindowIcon();
+
     switch (wm.subsystem) {
 #ifdef SDL_VIDEO_DRIVER_WINDOWS
     case SDL_SYSWM_TYPE::SDL_SYSWM_WINDOWS: