sylar/OmniaFramework
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed a MacOS bug in the stylesheet parser

Browse source
This commit is contained in:
OmniaX-Dev 2026-04-18 04:54:43 +02:00
parent ed3c21bd36
commit ad7b3e6bed
4 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.clangd
View file

@ -1,4 +1,5 @@
CompileFlags: CompileFlags:
CompilationDatabase: bin CompilationDatabase: bin
Add: ["--target=x86_64-w64-mingw32"]
Diagnostics: Diagnostics:
MissingIncludes: None MissingIncludes: None

2
other/build.nr
View file

@ -1 +1 @@
2066 2067

7
src/ostd/io/Stylesheet.cpp
View file

@ -21,6 +21,7 @@
#include "Stylesheet.hpp" #include "Stylesheet.hpp"
#include "FileSystem.hpp" #include "FileSystem.hpp"
#include "Logger.hpp" #include "Logger.hpp"
#include <algorithm>
namespace ostd namespace ostd
{ {
@ -361,7 +362,11 @@ namespace ostd
if (exitCondition) if (exitCondition)
return false; return false;
String lineCopy = line; String lineCopy = line;
for (const auto&[var, val] : variables) std::vector<std::pair<String, std::pair<String, bool>>> 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)) if (lineCopy.contains(var))
{ {

1
src/test/GuiTest.cpp
View file

@ -56,7 +56,6 @@ class Window : public ogfx::gui::Window
m_label1.addThemeOverride("@.label.borderColor", Colors::DarkMagenta); m_label1.addThemeOverride("@.label.borderColor", Colors::DarkMagenta);
m_label1.addThemeOverride("@:pressed.label.backgroundColor", Colors::Crimson); m_label1.addThemeOverride("@:pressed.label.backgroundColor", Colors::Crimson);
m_label1.addThemeOverride("@:hover.label.backgroundColor", Colors::DarkRed); m_label1.addThemeOverride("@:hover.label.backgroundColor", Colors::DarkRed);
m_label1.addThemeOverride("@:hover.label.cursor", cast<i32>(ogfx::WindowCore::eCursor::Pointer));
m_label1.reloadTheme(); m_label1.reloadTheme();
m_check1.setText("Check this out!"); m_check1.setText("Check this out!");