desktop/windowRule: allow expression in min_size/max_size (#12977)

This commit is contained in:
Florent Charpentier 2026-01-22 02:56:51 +11:00 committed by GitHub
parent e7985ca4c4
commit 22fc8136a2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 48 additions and 10 deletions

View file

@ -3164,12 +3164,22 @@ SDispatchResult CKeybindManager::setProp(std::string args) {
try {
if (PROP == "max_size") {
PWINDOW->m_ruleApplicator->maxSizeOverride(Desktop::Types::COverridableVar(configStringToVector2D(VAL), Desktop::Types::PRIORITY_SET_PROP));
const auto SIZE = PWINDOW->calculateExpression(VAL);
if (!SIZE) {
Log::logger->log(Log::ERR, "failed to parse {} as an expression", VAL);
throw "failed to parse expression";
}
PWINDOW->m_ruleApplicator->maxSizeOverride(Desktop::Types::COverridableVar(*SIZE, Desktop::Types::PRIORITY_SET_PROP));
PWINDOW->clampWindowSize(std::nullopt, PWINDOW->m_ruleApplicator->maxSize().value());
PWINDOW->setHidden(false);
} else if (PROP == "min_size") {
PWINDOW->m_ruleApplicator->minSizeOverride(Desktop::Types::COverridableVar(configStringToVector2D(VAL), Desktop::Types::PRIORITY_SET_PROP));
PWINDOW->clampWindowSize(std::nullopt, PWINDOW->m_ruleApplicator->minSize().value());
const auto SIZE = PWINDOW->calculateExpression(VAL);
if (!SIZE) {
Log::logger->log(Log::ERR, "failed to parse {} as an expression", VAL);
throw "failed to parse expression";
}
PWINDOW->m_ruleApplicator->minSizeOverride(Desktop::Types::COverridableVar(*SIZE, Desktop::Types::PRIORITY_SET_PROP));
PWINDOW->clampWindowSize(PWINDOW->m_ruleApplicator->minSize().value(), std::nullopt);
PWINDOW->setHidden(false);
} else if (PROP == "active_border_color" || PROP == "inactive_border_color") {
CGradientValueData colorData = {};