Shuffle support, plus image loading optimizations.

CMakeLists.txt

@@ -18,6 +18,7 @@ add_executable(themiify
     src/humanize.cpp
     src/installer.cpp
     src/ThemezerAPI.cpp
+    src/timer.cpp
     src/ImageLoader.cpp
     src/DownloadManager.cpp
     src/Camera.cpp
@@ -68,7 +69,7 @@ target_link_libraries(themiify PRIVATE
     quirc
     hips
     PkgConfig::zlib
-    PkgConfig::freetype2 
+    PkgConfig::freetype2
     PkgConfig::harfbuzz
     PkgConfig::libcurl
     PkgConfig::libpng
@@ -78,7 +79,7 @@ target_link_libraries(themiify PRIVATE
     PkgConfig::SDL2_mixer
 )
 
-target_compile_definitions(themiify PRIVATE THEMIIFY_VERSION="1.1")
+target_compile_definitions(themiify PRIVATE THEMIIFY_VERSION="1.1-dev")
 
 # run program using wiiload
 

external/CMakeLists.txt

@@ -19,14 +19,13 @@ add_library(imgui STATIC
 )
 
 target_include_directories(imgui PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/imgui
     ${CMAKE_CURRENT_SOURCE_DIR}/imgui/backends
     ${CMAKE_CURRENT_SOURCE_DIR}/imgui/misc/carousel
     ${CMAKE_CURRENT_SOURCE_DIR}/imgui/misc/cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/imgui/misc/freetype
 )
-target_compile_definitions(imgui PUBLIC IMGUI_USER_CONFIG="custom_imconfig.h")
+target_compile_definitions(imgui PUBLIC IMGUI_USER_CONFIG="${CMAKE_CURRENT_SOURCE_DIR}/custom_imconfig.h")
 
 target_link_libraries(imgui PUBLIC PkgConfig::sdl2 PkgConfig::freetype2)
 

src/App.cpp

@@ -15,7 +15,10 @@
 #include "DownloadManager.h"
 #include "Camera.h"
 #include "utils.h"
+#include "installer.h"
+#include "timer.hpp"
 
+#include <chrono>
 #include <fstream>
 #include <iostream>
 #include <span>
@@ -53,6 +56,7 @@
 using std::cout;
 using std::cerr;
 using std::endl;
+using namespace std::literals;
 
 namespace App {
     SDL_Window *window;
@@ -238,6 +242,8 @@ namespace App {
         Camera::initialize(renderer);
         Camera::open();
 
+        Installer::initialize();
+
         DownloadManager::initialize(user_agent);
         ImageLoader::initialize(renderer);
         NavBar::initialize(renderer);
@@ -277,6 +283,7 @@ namespace App {
 
         NavBar::finalize();
         ContentPanel::finalize();
+        Installer::finalize();
         ImageLoader::finalize();
         DownloadManager::finalize();
 
@@ -348,6 +355,8 @@ namespace App {
                 }
             }
 
+            ImageLoader::process();
+
             ImGui_ImplSDLRenderer2_NewFrame();
             ImGui_ImplSDL2_NewFrame();
 
@@ -378,8 +387,13 @@ namespace App {
                     StyleVar restore_border{ImGuiStyleVar_WindowBorderSize, orig_border};
                     StyleVar restore_rounding{ImGuiStyleVar_WindowRounding, orig_rounding};
                     NavBar::process_ui();
-                    ImGui::SameLine(0, 0); // NOTE: ignore ItemSpacing
-                    ContentPanel::process_ui(NavBar::get_current_tab());
+                    ImGui::SameLine(0, 9); // NOTE: override ItemSpacing
+                    {
+                        TimerReporter slow_content{std::cout,
+                                                   "ContentPanel::process_ui()",
+                                                   10ms};
+                        ContentPanel::process_ui(NavBar::get_current_tab());
+                    }
                 }
             }