Update logging library, add the ability to set custom theme files and add the ability for applications to whether layouts are loaded/saved automatically

Author: Madman10K

Config/Core/Modules.yaml

@@ -1 +1,2 @@
-undo-max-transactions: 100
+undo-max-transactions: 100
+theme-location: "default"

Config/Core/Window.yaml

@@ -1,4 +1,6 @@
 layout-location: "DefaultLayout"                  # The location of the layout file ImGui writes to
+load-layout: true                               # Whether to load the layout file ImGui writes to
+save-layout: true                               # Whether to automatically save to the layout file ImGui writes to
 icon: "example-icon.png"                          # The location of the window icon image
 width: 800                                        # Width of the window in pixels
 height: 600                                       # Height of the window in pixels

Framework/C/Interfaces/CLayoutsInterface.cpp

@@ -0,0 +1,17 @@
+#include "CLayoutsInterface.h"
+#include <Interfaces/LayoutsInterface.hpp>
+
+bool* UImGui_Layouts_getLoadLayout()
+{
+    return &UImGui::Layouts::getLoadLayout();
+}
+
+bool* UImGui_Layouts_getSaveLayout()
+{
+    return &UImGui::Layouts::getSaveLayout();
+}
+
+UImGui_String UImGui_Layouts_layoutLocation()
+{
+    return UImGui::Layouts::layoutLocation().c_str();
+}

Framework/C/Interfaces/CLayoutsInterface.h

@@ -0,0 +1,16 @@
+#pragma once
+#include <C/CTypes.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+    // Event Safety - begin, style, post-begin
+    UIMGUI_PUBLIC_API bool* UImGui_Layouts_getLoadLayout();
+    // Event Safety - begin, style, post-begin
+    UIMGUI_PUBLIC_API bool* UImGui_Layouts_getSaveLayout();
+    // Event Safety - begin, style, post-begin
+    UIMGUI_PUBLIC_API UImGui_String UImGui_Layouts_layoutLocation();
+#ifdef __cplusplus
+}
+#endif

Framework/C/Interfaces/CWindowInterface.cpp

@@ -63,11 +63,6 @@ UImGui_String UImGui_Window_iconLocation()
     return UImGui::Window::iconLocation().c_str();
 }
 
-UImGui_String UImGui_Window_layoutLocation()
-{
-    return UImGui::Window::layoutLocation().c_str();
-}
-
 void UImGui_Window_saveSettings(const bool bSaveKeybinds)
 {
     UImGui::Window::saveSettings(bSaveKeybinds);

Framework/C/Interfaces/CWindowInterface.h

@@ -51,8 +51,6 @@ extern "C"
     UIMGUI_PUBLIC_API UImGui_String UImGui_Window_name();
     // Event Safety - begin, style, post-begin
     UIMGUI_PUBLIC_API UImGui_String UImGui_Window_iconLocation();
-    // Event Safety - begin, style, post-begin
-    UIMGUI_PUBLIC_API UImGui_String UImGui_Window_layoutLocation();
 
     // Event Safety - begin, style, post-begin
     UIMGUI_PUBLIC_API void UImGui_Window_saveSettings(bool bSaveKeybinds);

Framework/C/Modules/Manager/CModulesManager.hpp

@@ -9,12 +9,15 @@ extern "C"
     /**
      * @brief Struct containing settings for all modules.
      * @var maxTransactions - Maximum number of undo/redo transactions before removing old transactions
+     * @var themeLocation - The string location of the theme file to be loaded and saved to by the theming module. Path
+     * is prefixed by UIMGUI_CONFIG_DIR/Theme/
      * @var os, dbus, uexec, theming, ufont, i18n, undo_redo, plotting, knobs, spinners, toggles, text_utils,
      * cli_parser, xdg, open - Boolean that marks whether the module with the given name is enabled
      */
     typedef struct UIMGUI_PUBLIC_API UImGui_ModuleSettings
     {
         size_t maxTransactions;
+        UImGui_String themeLocation;
 
         bool os;
         bool dbus;
@@ -32,6 +35,7 @@ extern "C"
         bool xdg;
         bool open;
     } UImGui_ModuleSettings;
+
     // Event safety - begin, style, post-begin
     UIMGUI_PUBLIC_API void UImGui_Modules_save();
     // Event safety - begin, style, post-begin

Framework/Core/Interfaces/LayoutsInterface.cpp

@@ -0,0 +1,28 @@
+#include "LayoutsInterface.hpp"
+#include "WindowInterface.hpp"
+#include "imgui.h"
+
+bool& UImGui::Layouts::getLoadLayout() noexcept
+{
+    return Window::get().windowData.bLoadLayout;
+}
+
+bool& UImGui::Layouts::getSaveLayout() noexcept
+{
+    return Window::get().windowData.bSaveLayout;
+}
+
+UImGui::FString& UImGui::Layouts::layoutLocation() noexcept
+{
+    return Window::get().windowData.layoutLocation;
+}
+
+void UImGui::Layouts::loadLayout(String layout) noexcept
+{
+    ImGui::LoadIniSettingsFromDisk(layout);
+}
+
+void UImGui::Layouts::saveLayout(String layout) noexcept
+{
+    ImGui::SaveIniSettingsToDisk(layout);
+}

Framework/Core/Interfaces/LayoutsInterface.hpp

@@ -0,0 +1,21 @@
+#pragma once
+#include <Core/Types.hpp>
+
+namespace UImGui
+{
+    class UIMGUI_PUBLIC_API Layouts
+    {
+    public:
+        Layouts() noexcept = default;
+
+        // Event Safety - begin, style, post-begin
+        static bool& getLoadLayout() noexcept;
+        // Event Safety - begin, style, post-begin
+        static bool& getSaveLayout() noexcept;
+        // Event Safety - begin, style, post-begin
+        static FString& layoutLocation() noexcept;
+
+        static void loadLayout(String layout) noexcept;
+        static void saveLayout(String layout) noexcept;
+    };
+}

Framework/Core/Interfaces/WindowInterface.cpp

@@ -79,11 +79,6 @@ void UImGui::Window::setIcon(const String name) noexcept
     get().setIcon(name);
 }
 
-UImGui::FString& UImGui::Window::layoutLocation() noexcept
-{
-    return get().windowData.layoutLocation;
-}
-
 void UImGui::Window::setCurrentWindowPosition(const FVector2 pos) noexcept
 {
     glfwSetWindowPos(get().windowMain, CAST(int, pos.x), CAST(int, pos.y));

Framework/Core/Interfaces/WindowInterface.hpp

@@ -42,8 +42,6 @@ namespace UImGui
         static FString& name() noexcept;
         // Event Safety - begin, style, post-begin
         static FString& iconLocation() noexcept;
-        // Event Safety - begin, style, post-begin
-        static FString& layoutLocation() noexcept;
 
         // Event Safety - begin, style, post-begin
         static void saveSettings(bool bSaveKeybinds) noexcept;

Framework/Modules/Manager/ModulesManager.cpp

@@ -12,7 +12,7 @@
 
 #define CHECK_MODULE_ENABLED(x)     if (mod[#x])    \
 {                                                   \
-    Modules::data().x = mod[#x].as<bool>();         \
+    settings.x = mod[#x].as<bool>();                \
 }
 
 #include <Utilities.hpp>
@@ -107,27 +107,27 @@ void UImGui::ModulesManager::initModules(const FString& projectDir)
     CHECK_MODULE_ENABLED(cli_parser);
     CHECK_MODULE_ENABLED(xdg);
     CHECK_MODULE_ENABLED(open);
-    
+
     // Fix up double forms
     if (mod["undo-redo"])
-        Modules::data().undo_redo = mod["undo-redo"].as<bool>();
+        settings.undo_redo = mod["undo-redo"].as<bool>();
     if (mod["text-utils"])
-        Modules::data().text_utils = mod["text-utils"].as<bool>();
+        settings.text_utils = mod["text-utils"].as<bool>();
     if (mod["cli-parser"])
-        Modules::data().cli_parser = mod["cli-parser"].as<bool>();
+        settings.cli_parser = mod["cli-parser"].as<bool>();
 
 #ifdef UIMGUI_UNDO_MODULE_ENABLED
-    if (Modules::data().undo_redo)
+    if (settings.undo_redo)
         stateTracker.init();
 #endif
 #ifdef UIMGUI_I18N_MODULE_ENABLED
-    if (Modules::data().i18n)
+    if (settings.i18n)
         if (const auto result = translationEngine.init((Instance::get()->initInfo.configDir + "Translations").c_str()) != UI18N_INIT_RESULT_SUCCESS)
             Logger::log("I18N module: There was an issue with loading or processing the translations. Error code: ", ULOG_LOG_TYPE_WARNING, CAST(int, result));
 #endif
 #ifdef UIMGUI_OS_MODULE_ENABLED
     #ifdef UIMGUI_OPEN_SUBMODULE_ENABLED
-        if (Modules::data().open)
+        if (settings.open)
             UOpen::init();
     #endif
 #endif
@@ -145,11 +145,27 @@ void UImGui::ModulesManager::initModules(const FString& projectDir)
 #endif
 }
 
-void UImGui::ModulesManager::destroy() noexcept
+void UImGui::ModulesManager::initialiseWithImGuiContext() const noexcept
+{
+#ifdef UIMGUI_PLOTTING_MODULE_ENABLED
+    if (settings.plotting)
+        ImPlot::CreateContext();
+#endif
+}
+
+void UImGui::ModulesManager::applyCustomisations() const noexcept
+{
+#ifdef UIMGUI_THEME_MODULE_ENABLED
+    if (settings.theming && (Modules::data().themeLocation != nullptr || Modules::data().themeLocation != ""))
+        Theme::load((Instance::get()->initInfo.configDir + "Theme/" + Modules::data().themeLocation + ".theme.yaml").c_str());
+#endif
+}
+
+void UImGui::ModulesManager::destroy() const noexcept
 {
 #ifdef UIMGUI_OS_MODULE_ENABLED
     #ifdef UIMGUI_OPEN_SUBMODULE_ENABLED
-        if (Modules::data().open)
+        if (settings.open)
             UOpen::destroy();
     #endif
 #endif

Framework/Modules/Manager/ModulesManager.hpp

@@ -62,6 +62,7 @@ namespace UImGui
         friend class Modules;
         friend class Global;
         friend class RendererInternal;
+        friend class GUIRenderer;
 
         friend class Locale;
         friend class LocaleManager;
@@ -71,6 +72,7 @@ namespace UImGui
         ModuleSettings settings =
         {
             .maxTransactions = 100,
+            .themeLocation = "",
             .os = false,
             .dbus = false,
             .uexec = false,
@@ -97,7 +99,13 @@ namespace UImGui
 
         void init(const FString& configDir);
         void initModules(const FString& projectDir);
-        void destroy() noexcept;
+
+        // Runs directly after creating the dear imgui context
+        void initialiseWithImGuiContext() const noexcept;
+        // Runs after the dear imgui context is created, but after everything is set up to be used by the user
+        void applyCustomisations() const noexcept;
+
+        void destroy() const noexcept;
 
         void save(const FString& configDir) const noexcept;
     };