Skip to content

Add support for mixed percentage/pixel in one axis of a layout value #908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Shiphan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add support for mixed percentage/pixel in one axis of a layout value #908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions src/config/ConfigDataValues.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class CLayoutValueData : public ICustomConfigValueData {
}

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) {
Expand All @@ -47,16 +47,13 @@ class CLayoutValueData : public ICustomConfigValueData {

Hyprutils::Math::Vector2D getAbsolute(const Hyprutils::Math::Vector2D& viewport) {
return {
(m_sIsRelative.x ? (m_vValues.x / 100) * viewport.x : m_vValues.x),
(m_sIsRelative.y ? (m_vValues.y / 100) * viewport.y : m_vValues.y),
((m_vPercentageValues.x / 100) * viewport.x + m_vPixelValues.x),
((m_vPercentageValues.y / 100) * viewport.y + m_vPixelValues.y),
};
}

Hyprutils::Math::Vector2D m_vValues;
struct {
bool x = false;
bool y = false;
} m_sIsRelative;
Hyprutils::Math::Vector2D m_vPercentageValues;
Hyprutils::Math::Vector2D m_vPixelValues;
};

class CGradientValueData : public ICustomConfigValueData {
Expand Down
94 changes: 78 additions & 16 deletions src/config/ConfigManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "../core/AnimationManager.hpp"
#include <hyprlang.hpp>
#include <hyprutils/string/String.hpp>
#include <hyprutils/string/ConstVarList.hpp>
#include <hyprutils/path/Path.hpp>
#include <filesystem>
#include <glob.h>
Expand Down Expand Up @@ -69,27 +70,88 @@ static Hyprlang::CParseResult configHandleLayoutOption(const char* v, void** dat
return result;
}

auto lhs = VALUE.substr(0, SPLIT);
auto rhs = VALUE.substr(SPLIT + 1);
if (rhs.starts_with(" "))
rhs = rhs.substr(1);
CConstVarList lhs(VALUE.substr(0, SPLIT), 0, 's', true);
CConstVarList rhs(VALUE.substr(SPLIT + 1), 0, 's', true);

if (lhs.contains(",") || rhs.contains(",")) {
result.setError(std::format("too many arguments in {}", VALUE).c_str());
return result;
}
if (lhs.size() == 1) {
auto value = lhs[0];
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 (lhs.ends_with("%")) {
DATA->m_sIsRelative.x = true;
lhs.pop_back();
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 (rhs.ends_with("%")) {
DATA->m_sIsRelative.y = true;
rhs.pop_back();
}
if (rhs.size() == 1) {
auto value = rhs[0];
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];

DATA->m_vValues = Hyprutils::Math::Vector2D{std::stof(lhs), std::stof(rhs)};
if (const auto [ptr, ec] = std::from_chars(percentage.data(), percentage.data() + percentage.size(), DATA->m_vPercentageValues.y);
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.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;
}
}

return result;
}
Expand Down