hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2025-12-24 03:30:02 +01:00
Code Issues Projects Releases Packages Wiki Activity

desktop/windowRule: force center and move rules to override each other (#12618)

Browse source
This commit is contained in:
Lichie 2025-12-17 10:23:12 -08:00 • committed by GitHub
parent 7098558420
commit 18901b8e59
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/desktop/rule/windowRule/WindowRuleApplicator.cpp
View file

@ -481,6 +481,7 @@ CWindowRuleApplicator::SRuleResult CWindowRuleApplicator::applyStaticRule(const
break; break;
} }
case WINDOW_RULE_EFFECT_MOVE: { case WINDOW_RULE_EFFECT_MOVE: {
static_.center = std::nullopt;
static_.position = effect; static_.position = effect;
break; break;
} }
@ -489,6 +490,7 @@ CWindowRuleApplicator::SRuleResult CWindowRuleApplicator::applyStaticRule(const
break; break;
} }
case WINDOW_RULE_EFFECT_CENTER: { case WINDOW_RULE_EFFECT_CENTER: {
static_.position.clear();
static_.center = truthy(effect); static_.center = truthy(effect);
break; break;
} }

2
src/desktop/rule/windowRule/WindowRuleApplicator.hpp
View file

@ -46,10 +46,10 @@ namespace Desktop::Rule {
std::optional<bool> pseudo; std::optional<bool> pseudo;
std::optional<bool> pin; std::optional<bool> pin;
std::optional<bool> noInitialFocus; std::optional<bool> noInitialFocus;
std::optional<bool> center;
std::optional<int> fullscreenStateClient; std::optional<int> fullscreenStateClient;
std::optional<int> fullscreenStateInternal; std::optional<int> fullscreenStateInternal;
std::optional<int> center;
std::optional<int> content; std::optional<int> content;
std::optional<int> noCloseFor; std::optional<int> noCloseFor;

2
src/desktop/view/Window.cpp
View file

@ -2248,7 +2248,7 @@ void CWindow::mapWindow() {
} }
} }
if (m_ruleApplicator->static_.center) { if (m_ruleApplicator->static_.center.value_or(false)) {
const auto WORKAREA = PMONITOR->logicalBoxMinusReserved(); const auto WORKAREA = PMONITOR->logicalBoxMinusReserved();
*m_realPosition = WORKAREA.middle() - m_realSize->goal() / 2.f; *m_realPosition = WORKAREA.middle() - m_realSize->goal() / 2.f;
} }