From 814b3392008c475e75f6c6da0cef82a3b01be400 Mon Sep 17 00:00:00 2001 From: Felix Salcher Date: Sun, 13 Jul 2025 19:18:20 +0200 Subject: [PATCH] change password option to password-appearance --- src/config/ConfigManager.cpp | 40 ++++++++++----------- src/renderer/widgets/PasswordInputField.cpp | 20 +++++------ 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp index 311e14a..e2466ee 100644 --- a/src/config/ConfigManager.cpp +++ b/src/config/ConfigManager.cpp @@ -283,16 +283,16 @@ 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", "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", "password:hide_eye", Hyprlang::INT{0}); - m_config.addSpecialConfigValue("input-field", "password:eye_margin", Hyprlang::INT{16}); - m_config.addSpecialConfigValue("input-field", "password:eye_size", Hyprlang::FLOAT{0.25}); - m_config.addSpecialConfigValue("input-field", "password:eye_placement", Hyprlang::STRING{"right"}); + m_config.addSpecialConfigValue("input-field", "password-appearance:dots_spacing", Hyprlang::FLOAT{0.2}); + m_config.addSpecialConfigValue("input-field", "password-appearance:dots_rounding", Hyprlang::INT{-1}); + m_config.addSpecialConfigValue("input-field", "password-appearance:dots_format", Hyprlang::STRING{""}); + m_config.addSpecialConfigValue("input-field", "password-appearance:size", Hyprlang::FLOAT{0.25}); + m_config.addSpecialConfigValue("input-field", "password-appearance:center", Hyprlang::INT{1}); + m_config.addSpecialConfigValue("input-field", "password-appearance:toggle_password_visibility", Hyprlang::INT{0}); + m_config.addSpecialConfigValue("input-field", "password-appearance:hide_eye", Hyprlang::INT{0}); + m_config.addSpecialConfigValue("input-field", "password-appearance:eye_margin", Hyprlang::INT{16}); + m_config.addSpecialConfigValue("input-field", "password-appearance:eye_size", Hyprlang::FLOAT{0.25}); + m_config.addSpecialConfigValue("input-field", "password-appearance:eye_placement", Hyprlang::STRING{"right"}); 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}); @@ -470,16 +470,16 @@ 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())}, - {"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())}, - {"password:hide_eye", m_config.getSpecialConfigValue("input-field", "password:hide_eye", k.c_str())}, - {"password:eye_margin", m_config.getSpecialConfigValue("input-field", "password:eye_margin", k.c_str())}, - {"password:eye_size", m_config.getSpecialConfigValue("input-field", "password:eye_size", k.c_str())}, - {"password:eye_placement", m_config.getSpecialConfigValue("input-field", "password:eye_placement", k.c_str())}, + {"password-appearance:dots_spacing", m_config.getSpecialConfigValue("input-field", "password-appearance:dots_spacing", k.c_str())}, + {"password-appearance:dots_rounding", m_config.getSpecialConfigValue("input-field", "password-appearance:dots_rounding", k.c_str())}, + {"password-appearance:dots_format", m_config.getSpecialConfigValue("input-field", "password-appearance:dots_format", k.c_str())}, + {"password-appearance:size", m_config.getSpecialConfigValue("input-field", "password-appearance:size", k.c_str())}, + {"password-appearance:center", m_config.getSpecialConfigValue("input-field", "password-appearance:center", k.c_str())}, + {"password-appearance:toggle_password_visibility", m_config.getSpecialConfigValue("input-field", "password-appearance:toggle_password_visibility", k.c_str())}, + {"password-appearance:hide_eye", m_config.getSpecialConfigValue("input-field", "password-appearance:hide_eye", k.c_str())}, + {"password-appearance:eye_margin", m_config.getSpecialConfigValue("input-field", "password-appearance:eye_margin", k.c_str())}, + {"password-appearance:eye_size", m_config.getSpecialConfigValue("input-field", "password-appearance:eye_size", k.c_str())}, + {"password-appearance:eye_placement", m_config.getSpecialConfigValue("input-field", "password-appearance:eye_placement", 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())}, diff --git a/src/renderer/widgets/PasswordInputField.cpp b/src/renderer/widgets/PasswordInputField.cpp index 26dc8dd..46d782b 100644 --- a/src/renderer/widgets/PasswordInputField.cpp +++ b/src/renderer/widgets/PasswordInputField.cpp @@ -40,16 +40,16 @@ 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("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")); - password.eye.hide = std::any_cast(props.at("password:hide_eye")); - password.eye.margin = std::any_cast(props.at("password:eye_margin")); - password.eye.size = std::any_cast(props.at("password:eye_size")); - password.eye.placement = std::any_cast(props.at("password:eye_placement")); + password.dots.spacing = std::any_cast(props.at("password-appearance:dots_spacing")); + password.dots.rounding = std::any_cast(props.at("password-appearance:dots_rounding")); + password.dots.format = std::any_cast(props.at("password-appearance:dots_format")); + password.size = std::any_cast(props.at("password-appearance:size")); + password.center = std::any_cast(props.at("password-appearance:center")); + password.allowToggle = std::any_cast(props.at("password-appearance:toggle_password_visibility")); + password.eye.hide = std::any_cast(props.at("password-appearance:hide_eye")); + password.eye.margin = std::any_cast(props.at("password-appearance:eye_margin")); + password.eye.size = std::any_cast(props.at("password-appearance:eye_size")); + password.eye.placement = std::any_cast(props.at("password-appearance:eye_placement")); fadeOnEmpty = std::any_cast(props.at("fade_on_empty")); fadeTimeoutMs = std::any_cast(props.at("fade_timeout")); hiddenInputState.enabled = std::any_cast(props.at("hide_input"));