hyprwm/hyprlock
1
0
Fork 0
mirror of https://github.com/hyprwm/hyprlock.git synced 2024-12-31 08:59:47 +01:00
Code Issues Projects Releases Packages Wiki Activity

input-field: fix alignment on multi-monitors (#175)

Browse source 
* input-field: fix alignment on multi-monitors

* clang-format

* remove redundant
This commit is contained in:
bvr-yr 2024-03-11 21:14:12 +03:00 committed by GitHub
parent ed26a6b4b0
commit 6027f12d3b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -23,9 +23,10 @@ CPasswordInputField::CPasswordInputField(const Vector2D& viewport_, const std::u
checkColor = std::any_cast<Hyprlang::INT>(props.at("check_color"));
viewport = viewport_;
auto POS__ = std::any_cast<Hyprlang::VEC2>(props.at("position"));
pos = {POS__.x, POS__.y};
configPos = pos;
auto POS__ = std::any_cast<Hyprlang::VEC2>(props.at("position"));
pos = {POS__.x, POS__.y};
configPos = pos;
configSize = size;
halign = std::any_cast<Hyprlang::STRING>(props.at("halign"));
valign = std::any_cast<Hyprlang::STRING>(props.at("valign"));
@ -167,19 +168,17 @@ bool CPasswordInputField::draw(const SRenderData& data) {
updateOuter();
updateHiddenInputState();
static auto ORIGSIZEX = size.x;
static auto ORIGPOS = pos;
static auto TIMER = std::chrono::system_clock::now();
static auto TIMER = std::chrono::system_clock::now();
if (placeholder.failAsset) {
const auto TARGETSIZEX = placeholder.failAsset->texture.m_vSize.x + inputFieldBox.h;
if (size.x < TARGETSIZEX) {
const auto DELTA = std::clamp((int)std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::system_clock::now() - TIMER).count(), 1000, 20000);
const auto DELTA = std::clamp((int)std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::system_clock::now() - TIMER).count(), 8000, 20000);
TIMER = std::chrono::system_clock::now();
forceReload = true;
size.x += (TARGETSIZEX - ORIGSIZEX) * DELTA / 100000.0;
size.x += std::clamp((TARGETSIZEX - size.x) * DELTA / 100000.0, 1.0, 1000.0);
if (size.x > TARGETSIZEX) {
size.x = TARGETSIZEX;
@ -188,9 +187,9 @@ bool CPasswordInputField::draw(const SRenderData& data) {
}
pos = posFromHVAlign(viewport, size, configPos, halign, valign);
} else {
size.x = ORIGSIZEX;
pos = ORIGPOS;
} else if (size.x != configSize.x) {
size.x = configSize.x;
pos = posFromHVAlign(viewport, size, configPos, halign, valign);
}
SRenderData shadowData = data;

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

@ -34,6 +34,7 @@ class CPasswordInputField : public IWidget {
Vector2D pos;
Vector2D viewport;
Vector2D configPos;
Vector2D configSize;
std::string halign, valign, configFailText;