chore: minor adjustments

src/gui/main.cpp

@@ -1,12 +1,13 @@
+#include <iostream>
 #include <memory>
 
 #include <GLFW/glfw3.h>
 #include <GLFW/glfw3native.h>
 
+#include "core/common/error.hpp"
+#include "core/common/utils.hpp"
 #include "core/config/config.hpp"
-#include "core/error.hpp"
 #include "core/io/toml_file.hpp"
-#include "core/utils.hpp"
 
 #include "gui/helpers/imgui_helpers.hpp"
 #include "gui/platform/font_loader.hpp"

src/gui/platform/windows/file_browser_windows.cpp

@@ -1,12 +1,15 @@
 #ifdef _WIN32
 
-#include "gui/platform/file_browser.hpp"
-#include <filesystem>
-
+// clang-format off
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 #include <commdlg.h>
 #include <shlobj.h>
 #include <shlwapi.h>
-#include <windows.h>
+// clang-format on
+
+#include "gui/platform/file_browser.hpp"
+#include <filesystem>
 
 namespace file_dialogs
 {
@@ -140,7 +143,11 @@ std::string select_folder_dialog(const std::string &title, const std::string &in
                 if (SUCCEEDED(hr))
                 {
                     std::wstring wpath(pszFilePath);
-                    std::string result(wpath.begin(), wpath.end());
+                    int size = WideCharToMultiByte(CP_UTF8, 0, wpath.c_str(), -1, nullptr, 0,
+                                                   nullptr, nullptr);
+                    std::string result(size - 1, 0);
+                    WideCharToMultiByte(CP_UTF8, 0, wpath.c_str(), -1, &result[0], size, nullptr,
+                                        nullptr);
                     CoTaskMemFree(pszFilePath);
                     pItem->Release();
                     pFileOpen->Release();

src/gui/views/about_window.cpp

@@ -1,5 +1,5 @@
-#include "about_window.hpp"
-#include "core/version.hpp"
+#include "gui/views/about_window.hpp"
+#include "core/common/version.hpp"
 #include "gui/helpers/imgui_helpers.hpp"
 #include "imgui.h"
 

src/gui/views/settings_window.cpp

@@ -1,6 +1,6 @@
 #include "gui/views/settings_window.hpp"
+#include "core/common/error.hpp"
 #include "core/config/config.hpp"
-#include "core/error.hpp"
 #include "gui/helpers/imgui_helpers.hpp"
 #include "gui/platform/file_browser.hpp"
 #include "gui/platform/font_loader.hpp"

src/gui/views/template_editor.cpp

@@ -1,8 +1,8 @@
 #include "template_editor.hpp"
+#include "core/common/utils.hpp"
 #include "core/config/config.hpp"
 #include "core/palette/color_keys.hpp"
 #include "core/theme/theme_template.hpp"
-#include "core/utils.hpp"
 #include "gui/helpers/imgui_helpers.hpp"
 #include "gui/platform/file_browser.hpp"
 #include "imgui.h"

src/gui/views/template_editor.hpp

@@ -2,9 +2,9 @@
 #define CLRSYNC_GUI_TEMPLATE_EDITOR_HPP
 
 #include "color_text_edit/TextEditor.h"
+#include "core/palette/palette.hpp"
 #include "gui/controllers/template_controller.hpp"
 #include "imgui.h"
-#include <core/palette/palette.hpp>
 #include <string>
 #include <vector>