diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp index 9e29530..20c0f0e 100644 --- a/src/config/ConfigManager.cpp +++ b/src/config/ConfigManager.cpp @@ -283,13 +283,12 @@ void CConfigManager::init() { m_config.addSpecialConfigValue("input-field", "inner_color", Hyprlang::INT{0xFFDDDDDD}); m_config.addSpecialConfigValue("input-field", "outer_color", GRADIENTCONFIG("0xFF111111")); m_config.addSpecialConfigValue("input-field", "outline_thickness", Hyprlang::INT{4}); - m_config.addSpecialConfigValue("input-field", "dots_size", Hyprlang::FLOAT{0.25}); - m_config.addSpecialConfigValue("input-field", "dots_center", Hyprlang::INT{1}); - m_config.addSpecialConfigValue("input-field", "dots_spacing", Hyprlang::FLOAT{0.2}); - m_config.addSpecialConfigValue("input-field", "dots_rounding", Hyprlang::INT{-1}); - m_config.addSpecialConfigValue("input-field", "dots_text_format", Hyprlang::STRING{""}); - m_config.addSpecialConfigValue("input-field", "password_size", Hyprlang::FLOAT{0.25}); - m_config.addSpecialConfigValue("input-field", "password_center", Hyprlang::INT{1}); + m_config.addSpecialConfigValue("input-field", "password:dots_spacing", Hyprlang::FLOAT{0.2}); + m_config.addSpecialConfigValue("input-field", "password:dots_rounding", Hyprlang::INT{-1}); + m_config.addSpecialConfigValue("input-field", "password:dots_format", Hyprlang::STRING{""}); + m_config.addSpecialConfigValue("input-field", "password:size", Hyprlang::FLOAT{0.25}); + m_config.addSpecialConfigValue("input-field", "password:center", Hyprlang::INT{1}); + m_config.addSpecialConfigValue("input-field", "password:toggle_password_visibility", Hyprlang::INT{0}); m_config.addSpecialConfigValue("input-field", "fade_on_empty", Hyprlang::INT{1}); m_config.addSpecialConfigValue("input-field", "fade_timeout", Hyprlang::INT{2000}); m_config.addSpecialConfigValue("input-field", "font_color", Hyprlang::INT{0xFF000000}); @@ -310,7 +309,6 @@ void CConfigManager::init() { m_config.addSpecialConfigValue("input-field", "invert_numlock", Hyprlang::INT{0}); m_config.addSpecialConfigValue("input-field", "swap_font_color", Hyprlang::INT{0}); m_config.addSpecialConfigValue("input-field", "zindex", Hyprlang::INT{0}); - m_config.addSpecialConfigValue("input-field", "password:toggle_password_visibility", Hyprlang::INT{0}); SHADOWABLE("input-field"); m_config.addSpecialCategory("label", Hyprlang::SSpecialCategoryOptions{.key = nullptr, .anonymousKeyBased = true}); @@ -468,13 +466,12 @@ std::vector CConfigManager::getWidgetConfigs() { {"inner_color", m_config.getSpecialConfigValue("input-field", "inner_color", k.c_str())}, {"outer_color", m_config.getSpecialConfigValue("input-field", "outer_color", k.c_str())}, {"outline_thickness", m_config.getSpecialConfigValue("input-field", "outline_thickness", k.c_str())}, - {"dots_size", m_config.getSpecialConfigValue("input-field", "dots_size", k.c_str())}, - {"dots_spacing", m_config.getSpecialConfigValue("input-field", "dots_spacing", k.c_str())}, - {"dots_center", m_config.getSpecialConfigValue("input-field", "dots_center", k.c_str())}, - {"dots_rounding", m_config.getSpecialConfigValue("input-field", "dots_rounding", k.c_str())}, - {"dots_text_format", m_config.getSpecialConfigValue("input-field", "dots_text_format", k.c_str())}, - {"password_size", m_config.getSpecialConfigValue("input-field", "password_size", k.c_str())}, - {"password_center", m_config.getSpecialConfigValue("input-field", "password_center", k.c_str())}, + {"password:dots_spacing", m_config.getSpecialConfigValue("input-field", "password:dots_spacing", k.c_str())}, + {"password:dots_rounding", m_config.getSpecialConfigValue("input-field", "password:dots_rounding", k.c_str())}, + {"password:dots_format", m_config.getSpecialConfigValue("input-field", "password:dots_format", k.c_str())}, + {"password:size", m_config.getSpecialConfigValue("input-field", "password:size", k.c_str())}, + {"password:center", m_config.getSpecialConfigValue("input-field", "password:center", k.c_str())}, + {"password:toggle_password_visibility", m_config.getSpecialConfigValue("input-field", "password:toggle_password_visibility", k.c_str())}, {"fade_on_empty", m_config.getSpecialConfigValue("input-field", "fade_on_empty", k.c_str())}, {"fade_timeout", m_config.getSpecialConfigValue("input-field", "fade_timeout", k.c_str())}, {"font_color", m_config.getSpecialConfigValue("input-field", "font_color", k.c_str())}, @@ -495,7 +492,6 @@ std::vector CConfigManager::getWidgetConfigs() { {"invert_numlock", m_config.getSpecialConfigValue("input-field", "invert_numlock", k.c_str())}, {"swap_font_color", m_config.getSpecialConfigValue("input-field", "swap_font_color", k.c_str())}, {"zindex", m_config.getSpecialConfigValue("input-field", "zindex", k.c_str())}, - {"password:toggle_password_visibility", m_config.getSpecialConfigValue("input-field", "password:toggle_password_visibility", k.c_str())}, SHADOWABLE("input-field"), } }); diff --git a/src/renderer/widgets/PasswordInputField.cpp b/src/renderer/widgets/PasswordInputField.cpp index fb8ea9a..7fee0ae 100644 --- a/src/renderer/widgets/PasswordInputField.cpp +++ b/src/renderer/widgets/PasswordInputField.cpp @@ -40,11 +40,11 @@ void CPasswordInputField::configure(const std::unordered_map(props.at("halign")); valign = std::any_cast(props.at("valign")); outThick = std::any_cast(props.at("outline_thickness")); - password.dots.spacing = std::any_cast(props.at("dots_spacing")); - password.dots.rounding = std::any_cast(props.at("dots_rounding")); - password.dots.format = std::any_cast(props.at("dots_text_format")); - password.size = std::any_cast(props.at("password_size")); - password.center = std::any_cast(props.at("password_center")); + password.dots.spacing = std::any_cast(props.at("password:dots_spacing")); + password.dots.rounding = std::any_cast(props.at("password:dots_rounding")); + password.dots.format = std::any_cast(props.at("password:dots_format")); + password.size = std::any_cast(props.at("password:size")); + password.center = std::any_cast(props.at("password:center")); password.allowToggle = std::any_cast(props.at("password:toggle_password_visibility")); fadeOnEmpty = std::any_cast(props.at("fade_on_empty")); fadeTimeoutMs = std::any_cast(props.at("fade_timeout"));