diff --git a/.clangd b/.clangd index e6defe1..c60968a 100644 --- a/.clangd +++ b/.clangd @@ -1,4 +1,5 @@ CompileFlags: CompilationDatabase: bin + Add: ["--target=x86_64-w64-mingw32"] Diagnostics: MissingIncludes: None \ No newline at end of file diff --git a/other/build.nr b/other/build.nr index 0e21d5e..a52986c 100644 --- a/other/build.nr +++ b/other/build.nr @@ -1 +1 @@ -2066 +2067 diff --git a/src/ostd/io/Stylesheet.cpp b/src/ostd/io/Stylesheet.cpp index 452c656..7262e7b 100644 --- a/src/ostd/io/Stylesheet.cpp +++ b/src/ostd/io/Stylesheet.cpp @@ -21,6 +21,7 @@ #include "Stylesheet.hpp" #include "FileSystem.hpp" #include "Logger.hpp" +#include namespace ostd { @@ -361,7 +362,11 @@ namespace ostd if (exitCondition) return false; String lineCopy = line; - for (const auto&[var, val] : variables) + std::vector>> sortedVars(variables.begin(), variables.end()); + std::sort(sortedVars.begin(), sortedVars.end(), [](const auto& a, const auto& b) { + return a.first.len() > b.first.len(); + }); + for (const auto&[var, val] : sortedVars) { if (lineCopy.contains(var)) { diff --git a/src/test/GuiTest.cpp b/src/test/GuiTest.cpp index 3e970ed..7141f28 100644 --- a/src/test/GuiTest.cpp +++ b/src/test/GuiTest.cpp @@ -56,7 +56,6 @@ class Window : public ogfx::gui::Window m_label1.addThemeOverride("@.label.borderColor", Colors::DarkMagenta); m_label1.addThemeOverride("@:pressed.label.backgroundColor", Colors::Crimson); m_label1.addThemeOverride("@:hover.label.backgroundColor", Colors::DarkRed); - m_label1.addThemeOverride("@:hover.label.cursor", cast(ogfx::WindowCore::eCursor::Pointer)); m_label1.reloadTheme(); m_check1.setText("Check this out!");