hyprwm/hyprlock
1
0
Fork 0
mirror of https://github.com/hyprwm/hyprlock.git synced 2025-12-20 08:50:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge d9e53881e7 into d099f87d36

Browse source
This commit is contained in:
Shiphan 2025-12-19 23:10:25 +01:00 • committed by GitHub
commit 47efbb89cf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 83 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/config/ConfigDataValues.hpp
View file

@ -35,7 +35,7 @@ class CLayoutValueData : public ICustomConfigValueData {
} }
virtual std::string toString() { virtual std::string toString() {
return std::format("{}{},{}{}", m_vValues.x, (m_sIsRelative.x) ? "%" : "px", m_vValues.y, (m_sIsRelative.y) ? "%" : "px"); return std::format("{}% + {}px,{}% + {}px", m_vPercentageValues.x, m_vPixelValues.x, m_vPercentageValues.y, m_vPixelValues.y);
} }
static CLayoutValueData* fromAnyPv(const std::any& v) { static CLayoutValueData* fromAnyPv(const std::any& v) {
@ -47,16 +47,13 @@ class CLayoutValueData : public ICustomConfigValueData {
Hyprutils::Math::Vector2D getAbsolute(const Hyprutils::Math::Vector2D& viewport) { Hyprutils::Math::Vector2D getAbsolute(const Hyprutils::Math::Vector2D& viewport) {
return { return {
(m_sIsRelative.x ? (m_vValues.x / 100) * viewport.x : m_vValues.x), ((m_vPercentageValues.x / 100) * viewport.x + m_vPixelValues.x),
(m_sIsRelative.y ? (m_vValues.y / 100) * viewport.y : m_vValues.y), ((m_vPercentageValues.y / 100) * viewport.y + m_vPixelValues.y),
}; };
} }
Hyprutils::Math::Vector2D m_vValues; Hyprutils::Math::Vector2D m_vPercentageValues;
struct { Hyprutils::Math::Vector2D m_vPixelValues;
bool x = false;
bool y = false;
} m_sIsRelative;
}; };
class CGradientValueData : public ICustomConfigValueData { class CGradientValueData : public ICustomConfigValueData {

94
src/config/ConfigManager.cpp
View file

@ -5,6 +5,7 @@
#include "../core/AnimationManager.hpp" #include "../core/AnimationManager.hpp"
#include <hyprlang.hpp> #include <hyprlang.hpp>
#include <hyprutils/string/String.hpp> #include <hyprutils/string/String.hpp>
#include <hyprutils/string/ConstVarList.hpp>
#include <hyprutils/path/Path.hpp> #include <hyprutils/path/Path.hpp>
#include <filesystem> #include <filesystem>
#include <glob.h> #include <glob.h>
@ -69,28 +70,89 @@ static Hyprlang::CParseResult configHandleLayoutOption(const char* v, void** dat
return result; return result;
} }
auto lhs = VALUE.substr(0, SPLIT); CConstVarList lhs(VALUE.substr(0, SPLIT), 0, 's', true);
auto rhs = VALUE.substr(SPLIT + 1); CConstVarList rhs(VALUE.substr(SPLIT + 1), 0, 's', true);
if (rhs.starts_with(" "))
rhs = rhs.substr(1);
if (lhs.contains(",") || rhs.contains(",")) { if (lhs.size() == 1) {
result.setError(std::format("too many arguments in {}", VALUE).c_str()); auto value = lhs[0];
return result; const auto is_percentage = value.ends_with("%");
if (is_percentage) {
value = value.substr(0, value.length() - 1);
}
auto& target = is_percentage ? DATA->m_vPercentageValues.x : DATA->m_vPixelValues.x;
const auto [ptr, ec] = std::from_chars(value.data(), value.data() + value.size(), target);
if (ec != std::errc() || ptr != value.data() + value.size()) {
result.setError(std::format("expected a number, got {}", value).c_str());
return result;
}
} else {
if (lhs[1] != "+" && lhs[1] != "-") {
result.setError("only supports + and -");
return result;
}
auto percentage = lhs[0];
if (percentage.ends_with("%")) {
percentage = percentage.substr(0, percentage.length() - 1);
} else {
result.setError(std::format("expected a percentage value, got {}", percentage).c_str());
return result;
}
const auto pixel = lhs[2];
if (const auto [ptr, ec] = std::from_chars(percentage.data(), percentage.data() + percentage.size(), DATA->m_vPercentageValues.x);
ec != std::errc() || ptr != percentage.data() + percentage.size()) {
result.setError(std::format("expected a number, got {}", percentage).c_str());
return result;
}
if (const auto [ptr, ec] = std::from_chars(pixel.data(), pixel.data() + pixel.size(), DATA->m_vPixelValues.x); ec != std::errc() || ptr != pixel.data() + pixel.size()) {
result.setError(std::format("expected a number, got {}", pixel).c_str());
return result;
}
if (lhs[1][0] == '-') {
DATA->m_vPixelValues.x *= -1;
}
} }
if (lhs.ends_with("%")) { if (rhs.size() == 1) {
DATA->m_sIsRelative.x = true; auto value = rhs[0];
lhs.pop_back(); const auto is_percentage = value.ends_with("%");
} if (is_percentage) {
value = value.substr(0, value.length() - 1);
}
auto& target = is_percentage ? DATA->m_vPercentageValues.y : DATA->m_vPixelValues.y;
const auto [ptr, ec] = std::from_chars(value.data(), value.data() + value.size(), target);
if (ec != std::errc() || ptr != value.data() + value.size()) {
result.setError(std::format("expected a number, got {}", value).c_str());
return result;
}
} else {
if (rhs[1] != "+" && rhs[1] != "-") {
result.setError("only supports + and -");
return result;
}
auto percentage = rhs[0];
if (percentage.ends_with("%")) {
percentage = percentage.substr(0, percentage.length() - 1);
} else {
result.setError(std::format("expected a percentage value, got {}", percentage).c_str());
return result;
}
const auto pixel = rhs[2];
if (rhs.ends_with("%")) { if (const auto [ptr, ec] = std::from_chars(percentage.data(), percentage.data() + percentage.size(), DATA->m_vPercentageValues.y);
DATA->m_sIsRelative.y = true; ec != std::errc() || ptr != percentage.data() + percentage.size()) {
rhs.pop_back(); result.setError(std::format("expected a number, got {}", percentage).c_str());
return result;
}
if (const auto [ptr, ec] = std::from_chars(pixel.data(), pixel.data() + pixel.size(), DATA->m_vPixelValues.y); ec != std::errc() || ptr != pixel.data() + pixel.size()) {
result.setError(std::format("expected a number, got {}", pixel).c_str());
return result;
}
if (rhs[1][0] == '-') {
DATA->m_vPixelValues.y *= -1;
}
} }
DATA->m_vValues = Hyprutils::Math::Vector2D{std::stof(lhs), std::stof(rhs)};
return result; return result;
} }