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

windowrules: fix persistent_size not applying (#12441)

Browse source
This commit is contained in:
EvilLary 2025-11-25 02:48:10 +03:00 • committed by GitHub
parent 3d7ea9c02f
commit 475e87b351
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
hyprtester/src/tests/main/window.cpp
View file

@ -397,6 +397,34 @@ static bool test() {
OK(getFromSocket("/reload")); OK(getFromSocket("/reload"));
Tests::killAllWindows(); Tests::killAllWindows();
// test persistent_size between floating window launches
OK(getFromSocket("/keyword windowrule match:class persistent_size_kitty, persistent_size true, float true"));
if (!spawnKitty("persistent_size_kitty"))
return false;
OK(getFromSocket("/dispatch resizeactive exact 600 400"))
{
auto str = getFromSocket("/activewindow");
EXPECT_CONTAINS(str, "size: 600,400");
EXPECT_CONTAINS(str, "floating: 1");
}
Tests::killAllWindows();
if (!spawnKitty("persistent_size_kitty"))
return false;
{
auto str = getFromSocket("/activewindow");
EXPECT_CONTAINS(str, "size: 600,400");
EXPECT_CONTAINS(str, "floating: 1");
}
OK(getFromSocket("/reload"));
Tests::killAllWindows();
OK(getFromSocket("/keyword general:border_size 0")); OK(getFromSocket("/keyword general:border_size 0"));
OK(getFromSocket("/keyword windowrule match:float true, border_size 10")); OK(getFromSocket("/keyword windowrule match:float true, border_size 10"));

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

@ -130,10 +130,8 @@ CWindowRuleApplicator::SRuleResult CWindowRuleApplicator::applyDynamicRule(const
break; break;
} }
case WINDOW_RULE_EFFECT_PERSISTENT_SIZE: { case WINDOW_RULE_EFFECT_PERSISTENT_SIZE: {
try { m_persistentSize.first.set(truthy(effect), Types::PRIORITY_WINDOW_RULE);
m_persistentSize.first.set(std::stoi(effect), Types::PRIORITY_WINDOW_RULE);
m_persistentSize.second |= rule->getPropertiesMask(); m_persistentSize.second |= rule->getPropertiesMask();
} catch (...) { Debug::log(ERR, "CWindowRuleApplicator::applyDynamicRule: invalid rounding_power {}", effect); }
break; break;
} }
case WINDOW_RULE_EFFECT_ANIMATION: { case WINDOW_RULE_EFFECT_ANIMATION: {

3
src/layout/IHyprLayout.cpp
View file

@ -108,6 +108,9 @@ void IHyprLayout::onWindowCreatedFloating(PHLWINDOW pWindow) {
xy = g_pXWaylandManager->xwaylandToWaylandCoords(xy); xy = g_pXWaylandManager->xwaylandToWaylandCoords(xy);
desiredGeometry.x = xy.x; desiredGeometry.x = xy.x;
desiredGeometry.y = xy.y; desiredGeometry.y = xy.y;
} else if (pWindow->m_ruleApplicator->persistentSize().valueOrDefault()) {
desiredGeometry.w = pWindow->m_lastFloatingSize.x;
desiredGeometry.h = pWindow->m_lastFloatingSize.y;
} }
static auto PXWLFORCESCALEZERO = CConfigValue<Hyprlang::INT>("xwayland:force_zero_scaling"); static auto PXWLFORCESCALEZERO = CConfigValue<Hyprlang::INT>("xwayland:force_zero_scaling");