From b94f1498542be0e83fe8060a50bce5ff2d5a1c39 Mon Sep 17 00:00:00 2001 From: Vaxry <43317083+vaxerski@users.noreply.github.com> Date: Fri, 8 May 2026 15:31:02 +0100 Subject: config: allow hashes for parsing colors (#14337) --- src/config/lua/bindings/LuaBindingsNotification.cpp | 3 ++- src/config/lua/objects/LuaNotification.cpp | 5 ++++- src/config/lua/types/LuaConfigColor.cpp | 4 +++- src/config/lua/types/LuaConfigGradient.cpp | 3 ++- 4 files changed, 11 insertions(+), 4 deletions(-) (limited to 'src/config/lua') diff --git a/src/config/lua/bindings/LuaBindingsNotification.cpp b/src/config/lua/bindings/LuaBindingsNotification.cpp index b7a54546..3ba14ce7 100644 --- a/src/config/lua/bindings/LuaBindingsNotification.cpp +++ b/src/config/lua/bindings/LuaBindingsNotification.cpp @@ -1,6 +1,7 @@ #include "LuaBindingsInternal.hpp" #include "../objects/LuaNotification.hpp" +#include "../../shared/parserUtils/ParserUtils.hpp" #include "../../../helpers/MiscFunctions.hpp" #include "../../../notification/NotificationOverlay.hpp" @@ -52,7 +53,7 @@ static std::optional parseColorArg(lua_State* L, int idx) { return CHyprColor(sc(lua_tonumber(L, idx))); if (lua_isstring(L, idx)) { - auto parsed = configStringToInt(lua_tostring(L, idx)); + auto parsed = ParserUtils::parseColor(lua_tostring(L, idx)); if (!parsed) return std::nullopt; diff --git a/src/config/lua/objects/LuaNotification.cpp b/src/config/lua/objects/LuaNotification.cpp index f116e2eb..99382bf6 100644 --- a/src/config/lua/objects/LuaNotification.cpp +++ b/src/config/lua/objects/LuaNotification.cpp @@ -8,6 +8,9 @@ #include #include +#include "../../shared/parserUtils/ParserUtils.hpp" + +using namespace Config; using namespace Config::Lua; static constexpr const char* MT = "HL.Notification"; @@ -23,7 +26,7 @@ namespace { return CHyprColor(sc(lua_tonumber(L, idx))); if (lua_isstring(L, idx)) { - auto parsed = configStringToInt(lua_tostring(L, idx)); + auto parsed = ParserUtils::parseColor(lua_tostring(L, idx)); if (!parsed) return std::nullopt; diff --git a/src/config/lua/types/LuaConfigColor.cpp b/src/config/lua/types/LuaConfigColor.cpp index c58b232b..e8c79088 100644 --- a/src/config/lua/types/LuaConfigColor.cpp +++ b/src/config/lua/types/LuaConfigColor.cpp @@ -3,6 +3,8 @@ #include #include +#include "../../shared/parserUtils/ParserUtils.hpp" + #include "../../../helpers/Color.hpp" #include "../../../helpers/MiscFunctions.hpp" @@ -10,7 +12,7 @@ using namespace Config; using namespace Config::Lua; static std::expected parseColorString(const std::string& str) { - auto result = configStringToInt(str); + auto result = ParserUtils::parseColor(str); if (!result) return std::unexpected(std::format("invalid color \"{}\"", str)); return CHyprColor(sc(*result)); diff --git a/src/config/lua/types/LuaConfigGradient.cpp b/src/config/lua/types/LuaConfigGradient.cpp index 6e5838a9..cc936509 100644 --- a/src/config/lua/types/LuaConfigGradient.cpp +++ b/src/config/lua/types/LuaConfigGradient.cpp @@ -1,4 +1,5 @@ #include "LuaConfigGradient.hpp" +#include "../../shared/parserUtils/ParserUtils.hpp" #include "../../../helpers/MiscFunctions.hpp" #include @@ -7,7 +8,7 @@ using namespace Config; using namespace Config::Lua; static std::expected parseColorString(const std::string& str) { - auto result = configStringToInt(str); + auto result = ParserUtils::parseColor(str); if (!result) return std::unexpected(std::format("invalid color \"{}\"", str)); return CHyprColor(sc(*result)); -- cgit v1.2.3