hyprwm/hyprlock
1
0
Fork 0
mirror of https://github.com/hyprwm/hyprlock.git synced 2024-11-16 23:05:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

input-field: add dots rounding option (#130)

Browse source 
* refactor: move dot props to struct, rename to camelCase

* input-field: add dots rounding option

* render: minor fix for odd input-field width

* add dots_rounding option to Home Manager
This commit is contained in:
bvr-yr 2024-03-04 20:59:36 +03:00 committed by GitHub
parent 49ef1d306c
commit d1f542a75f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 33 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nix/hm-module.nix
View file

@ -181,6 +181,12 @@ in {
default = true; default = true;
}; };
dots_rounding = mkOption {
description = "The rounding of dots (-2 follows input-field rounding)";
type = int;
default = -1;
};
outer_color = mkOption { outer_color = mkOption {
description = "The outer color of the input field"; description = "The outer color of the input field";
type = str; type = str;

2
src/config/ConfigManager.cpp
View file

@ -61,6 +61,7 @@ void CConfigManager::init() {
m_config.addSpecialConfigValue("input-field", "dots_size", Hyprlang::FLOAT{0.25}); 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_center", Hyprlang::INT{1});
m_config.addSpecialConfigValue("input-field", "dots_spacing", Hyprlang::FLOAT{0.2}); 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", "fade_on_empty", Hyprlang::INT{1}); m_config.addSpecialConfigValue("input-field", "fade_on_empty", Hyprlang::INT{1});
m_config.addSpecialConfigValue("input-field", "font_color", Hyprlang::INT{0xFF000000}); m_config.addSpecialConfigValue("input-field", "font_color", Hyprlang::INT{0xFF000000});
m_config.addSpecialConfigValue("input-field", "halign", Hyprlang::STRING{"center"}); m_config.addSpecialConfigValue("input-field", "halign", Hyprlang::STRING{"center"});
@ -136,6 +137,7 @@ std::vector<CConfigManager::SWidgetConfig> CConfigManager::getWidgetConfigs() {
{"dots_size", m_config.getSpecialConfigValue("input-field", "dots_size", 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_spacing", m_config.getSpecialConfigValue("input-field", "dots_spacing", k.c_str())},
{"dots_center", m_config.getSpecialConfigValue("input-field", "dots_center", 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())},
{"fade_on_empty", m_config.getSpecialConfigValue("input-field", "fade_on_empty", k.c_str())}, {"fade_on_empty", m_config.getSpecialConfigValue("input-field", "fade_on_empty", k.c_str())},
{"font_color", m_config.getSpecialConfigValue("input-field", "font_color", k.c_str())}, {"font_color", m_config.getSpecialConfigValue("input-field", "font_color", k.c_str())},
{"halign", m_config.getSpecialConfigValue("input-field", "halign", k.c_str())}, {"halign", m_config.getSpecialConfigValue("input-field", "halign", k.c_str())},

29
src/renderer/widgets/PasswordInputField.cpp
View file

@ -7,10 +7,11 @@ CPasswordInputField::CPasswordInputField(const Vector2D& viewport_, const std::u
size = std::any_cast<Hyprlang::VEC2>(props.at("size")); size = std::any_cast<Hyprlang::VEC2>(props.at("size"));
inner = std::any_cast<Hyprlang::INT>(props.at("inner_color")); inner = std::any_cast<Hyprlang::INT>(props.at("inner_color"));
outer = std::any_cast<Hyprlang::INT>(props.at("outer_color")); outer = std::any_cast<Hyprlang::INT>(props.at("outer_color"));
out_thick = std::any_cast<Hyprlang::INT>(props.at("outline_thickness")); outThick = std::any_cast<Hyprlang::INT>(props.at("outline_thickness"));
dt_size = std::any_cast<Hyprlang::FLOAT>(props.at("dots_size")); dots.size = std::any_cast<Hyprlang::FLOAT>(props.at("dots_size"));
dt_space = std::any_cast<Hyprlang::FLOAT>(props.at("dots_spacing")); dots.spacing = std::any_cast<Hyprlang::FLOAT>(props.at("dots_spacing"));
dots.center = std::any_cast<Hyprlang::INT>(props.at("dots_center")); dots.center = std::any_cast<Hyprlang::INT>(props.at("dots_center"));
dots.rounding = std::any_cast<Hyprlang::INT>(props.at("dots_rounding"));
fadeOnEmpty = std::any_cast<Hyprlang::INT>(props.at("fade_on_empty")); fadeOnEmpty = std::any_cast<Hyprlang::INT>(props.at("fade_on_empty"));
font = std::any_cast<Hyprlang::INT>(props.at("font_color")); font = std::any_cast<Hyprlang::INT>(props.at("font_color"));
pos = std::any_cast<Hyprlang::VEC2>(props.at("position")); pos = std::any_cast<Hyprlang::VEC2>(props.at("position"));
@ -19,8 +20,8 @@ CPasswordInputField::CPasswordInputField(const Vector2D& viewport_, const std::u
viewport = viewport_; viewport = viewport_;
pos = posFromHVAlign(viewport, size, pos, std::any_cast<Hyprlang::STRING>(props.at("halign")), std::any_cast<Hyprlang::STRING>(props.at("valign"))); pos = posFromHVAlign(viewport, size, pos, std::any_cast<Hyprlang::STRING>(props.at("halign")), std::any_cast<Hyprlang::STRING>(props.at("valign")));
dt_size = std::clamp(dt_size, 0.2f, 0.8f); dots.size = std::clamp(dots.size, 0.2f, 0.8f);
dt_space = std::clamp(dt_space, 0.f, 1.f); dots.spacing = std::clamp(dots.spacing, 0.f, 1.f);
std::string placeholderText = std::any_cast<Hyprlang::STRING>(props.at("placeholder_text")); std::string placeholderText = std::any_cast<Hyprlang::STRING>(props.at("placeholder_text"));
if (!placeholderText.empty()) { if (!placeholderText.empty()) {
@ -102,7 +103,7 @@ void CPasswordInputField::updateDots() {
bool CPasswordInputField::draw(const SRenderData& data) { bool CPasswordInputField::draw(const SRenderData& data) {
CBox inputFieldBox = {pos, size}; CBox inputFieldBox = {pos, size};
CBox outerBox = {pos - Vector2D{out_thick, out_thick}, size + Vector2D{out_thick * 2, out_thick * 2}}; CBox outerBox = {pos - Vector2D{outThick, outThick}, size + Vector2D{outThick * 2, outThick * 2}};
bool forceReload = false; bool forceReload = false;
@ -139,10 +140,10 @@ bool CPasswordInputField::draw(const SRenderData& data) {
glDisable(GL_SCISSOR_TEST); glDisable(GL_SCISSOR_TEST);
} }
g_pRenderer->renderRect(inputFieldBox, innerCol, rounding == -1 ? inputFieldBox.h / 2.0 : rounding - out_thick); g_pRenderer->renderRect(inputFieldBox, innerCol, rounding == -1 ? inputFieldBox.h / 2.0 : rounding - outThick);
const int PASS_SIZE = std::nearbyint(inputFieldBox.h * dt_size * 0.5f) * 2.f; const int PASS_SIZE = std::nearbyint(inputFieldBox.h * dots.size * 0.5f) * 2.f;
const int PASS_SPACING = std::floor(PASS_SIZE * dt_space); const int PASS_SPACING = std::floor(PASS_SIZE * dots.spacing);
const int DOT_PAD = (inputFieldBox.h - PASS_SIZE) / 2; const int DOT_PAD = (inputFieldBox.h - PASS_SIZE) / 2;
const int DOT_AREA_WIDTH = inputFieldBox.w - DOT_PAD * 2; // avail width for dots const int DOT_AREA_WIDTH = inputFieldBox.w - DOT_PAD * 2; // avail width for dots
const int MAX_DOTS = std::round(DOT_AREA_WIDTH * 1.0 / (PASS_SIZE + PASS_SPACING)); // max amount of dots that can fit in the area const int MAX_DOTS = std::round(DOT_AREA_WIDTH * 1.0 / (PASS_SIZE + PASS_SPACING)); // max amount of dots that can fit in the area
@ -158,6 +159,11 @@ bool CPasswordInputField::draw(const SRenderData& data) {
if (dots.currentAmount > MAX_DOTS) if (dots.currentAmount > MAX_DOTS)
xstart = (inputFieldBox.w + MAX_DOTS * (PASS_SIZE + PASS_SPACING) - PASS_SPACING - 2 * TOTAL_DOTS_WIDTH) / 2; xstart = (inputFieldBox.w + MAX_DOTS * (PASS_SIZE + PASS_SPACING) - PASS_SPACING - 2 * TOTAL_DOTS_WIDTH) / 2;
if (dots.rounding == -1)
dots.rounding = PASS_SIZE / 2.0;
else if (dots.rounding == -2)
dots.rounding = rounding == -1 ? PASS_SIZE / 2.0 : rounding * dots.size;
for (int i = 0; i < dots.currentAmount; ++i) { for (int i = 0; i < dots.currentAmount; ++i) {
if (i < DOT_FLOORED - MAX_DOTS) if (i < DOT_FLOORED - MAX_DOTS)
continue; continue;
@ -169,9 +175,10 @@ bool CPasswordInputField::draw(const SRenderData& data) {
fontCol.a *= (1 - dots.currentAmount + DOT_FLOORED) * data.opacity; fontCol.a *= (1 - dots.currentAmount + DOT_FLOORED) * data.opacity;
} }
Vector2D dotPosition = inputFieldBox.pos() + Vector2D{xstart + i * (PASS_SIZE + PASS_SPACING), inputFieldBox.h / 2.f - PASS_SIZE / 2.f}; Vector2D dotPosition =
inputFieldBox.pos() + Vector2D{xstart + (int)inputFieldBox.w % 2 / 2.f + i * (PASS_SIZE + PASS_SPACING), inputFieldBox.h / 2.f - PASS_SIZE / 2.f};
CBox box{dotPosition, Vector2D{PASS_SIZE, PASS_SIZE}}; CBox box{dotPosition, Vector2D{PASS_SIZE, PASS_SIZE}};
g_pRenderer->renderRect(box, fontCol, PASS_SIZE / 2.0); g_pRenderer->renderRect(box, fontCol, dots.rounding);
fontCol.a = DOT_ALPHA; fontCol.a = DOT_ALPHA;
} }
} }

8
src/renderer/widgets/PasswordInputField.hpp
View file

@ -26,9 +26,7 @@ class CPasswordInputField : public IWidget {
Vector2D pos; Vector2D pos;
Vector2D viewport; Vector2D viewport;
float dt_size, dt_space; int outThick, rounding;
int out_thick;
CColor inner, outer, font; CColor inner, outer, font;
@ -37,6 +35,9 @@ class CPasswordInputField : public IWidget {
float speedPerSecond = 5; // actually per... something. I am unsure xD float speedPerSecond = 5; // actually per... something. I am unsure xD
std::chrono::system_clock::time_point lastFrame; std::chrono::system_clock::time_point lastFrame;
bool center = false; bool center = false;
float size = 0;
float spacing = 0;
int rounding = 0;
} dots; } dots;
struct { struct {
@ -63,5 +64,4 @@ class CPasswordInputField : public IWidget {
} hiddenInputState; } hiddenInputState;
bool fadeOnEmpty; bool fadeOnEmpty;
int rounding;
}; };