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

windowrules: fix group rule recalcs (#12403)

Browse source
This commit is contained in:
Vaxry 2025-11-20 16:57:31 +00:00 • committed by GitHub
parent 00cce1c8ff
commit c249a9f4b8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 83 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -131,6 +131,68 @@ static void testSwapWindow() {
EXPECT(Tests::windowCount(), 0);
}
static void testGroupRules() {
NLog::log("{}Testing group window rules", Colors::YELLOW);
OK(getFromSocket("/keyword general:border_size 8"));
OK(getFromSocket("/keyword workspace w[tv1], bordersize:0"));
OK(getFromSocket("/keyword workspace f[1], bordersize:0"));
OK(getFromSocket("/keyword windowrule match:workspace w[tv1], border_size 0"));
OK(getFromSocket("/keyword windowrule match:workspace f[1], border_size 0"));
if (!Tests::spawnKitty("kitty_A")) {
ret = 1;
return;
}
{
auto str = getFromSocket("/getprop active border_size");
EXPECT_CONTAINS(str, "0");
}
if (!Tests::spawnKitty("kitty_B")) {
ret = 1;
return;
}
{
auto str = getFromSocket("/getprop active border_size");
EXPECT_CONTAINS(str, "8");
}
OK(getFromSocket("/dispatch focuswindow class:kitty_A"));
OK(getFromSocket("/dispatch togglegroup"));
OK(getFromSocket("/dispatch focuswindow class:kitty_B"));
OK(getFromSocket("/dispatch moveintogroup l"));
{
auto str = getFromSocket("/getprop active border_size");
EXPECT_CONTAINS(str, "0");
}
OK(getFromSocket("/dispatch changegroupactive f"));
{
auto str = getFromSocket("/getprop active border_size");
EXPECT_CONTAINS(str, "0");
}
if (!Tests::spawnKitty("kitty_C")) {
ret = 1;
return;
}
OK(getFromSocket("/dispatch moveoutofgroup r"));
{
auto str = getFromSocket("/getprop active border_size");
EXPECT_CONTAINS(str, "8");
}
OK(getFromSocket("/reload"));
Tests::killAllWindows();
}
static bool test() {
NLog::log("{}Testing windows", Colors::GREEN);
@ -403,6 +465,11 @@ static bool test() {
OK(getFromSocket("/dispatch plugin:test:check_rule"));
OK(getFromSocket("/reload"));
Tests::killAllWindows();
testGroupRules();
NLog::log("{}Reloading config", Colors::YELLOW);
OK(getFromSocket("/reload"));

10
src/desktop/Window.cpp
View file

@ -901,6 +901,8 @@ void CWindow::setGroupCurrent(PHLWINDOW pWindow) {
g_pHyprRenderer->damageWindow(pWindow);
pWindow->m_ruleApplicator->propertiesChanged(Desktop::Rule::RULE_PROP_GROUP | Desktop::Rule::RULE_PROP_ON_WORKSPACE);
m_ruleApplicator->propertiesChanged(Desktop::Rule::RULE_PROP_GROUP | Desktop::Rule::RULE_PROP_ON_WORKSPACE);
pWindow->updateWindowDecos();
}
@ -922,6 +924,10 @@ void CWindow::insertWindowToGroup(PHLWINDOW pWindow) {
SHEAD->m_groupData.head = false;
BEGINAT->m_groupData.pNextWindow = SHEAD;
STAIL->m_groupData.pNextWindow = ENDAT;
pWindow->m_ruleApplicator->propertiesChanged(Desktop::Rule::RULE_PROP_GROUP | Desktop::Rule::RULE_PROP_ON_WORKSPACE);
m_ruleApplicator->propertiesChanged(Desktop::Rule::RULE_PROP_GROUP | Desktop::Rule::RULE_PROP_ON_WORKSPACE);
pWindow->updateWindowDecos();
}
PHLWINDOW CWindow::getGroupPrevious() {
@ -954,6 +960,10 @@ void CWindow::switchWithWindowInGroup(PHLWINDOW pWindow) {
std::swap(m_groupData.head, pWindow->m_groupData.head);
std::swap(m_groupData.locked, pWindow->m_groupData.locked);
pWindow->m_ruleApplicator->propertiesChanged(Desktop::Rule::RULE_PROP_GROUP | Desktop::Rule::RULE_PROP_ON_WORKSPACE);
m_ruleApplicator->propertiesChanged(Desktop::Rule::RULE_PROP_GROUP | Desktop::Rule::RULE_PROP_ON_WORKSPACE);
pWindow->updateWindowDecos();
}
void CWindow::updateGroupOutputs() {

2
src/layout/DwindleLayout.cpp
View file

@ -480,6 +480,7 @@ void CHyprDwindleLayout::onWindowCreatedTiling(PHLWINDOW pWindow, eDirection dir
NEWPARENT->recalcSizePosRecursive(false, horizontalOverride, verticalOverride);
recalculateMonitor(pWindow->monitorID());
pWindow->m_workspace->updateWindows();
}
void CHyprDwindleLayout::onWindowRemovedTiling(PHLWINDOW pWindow) {
@ -528,6 +529,7 @@ void CHyprDwindleLayout::onWindowRemovedTiling(PHLWINDOW pWindow) {
m_dwindleNodesData.remove(*PPARENT);
m_dwindleNodesData.remove(*PNODE);
pWindow->m_workspace->updateWindows();
}
void CHyprDwindleLayout::recalculateMonitor(const MONITORID& monid) {

2
src/layout/MasterLayout.cpp
View file

@ -230,6 +230,7 @@ void CHyprMasterLayout::onWindowCreatedTiling(PHLWINDOW pWindow, eDirection dire
// recalc
recalculateMonitor(pWindow->monitorID());
pWindow->m_workspace->updateWindows();
}
void CHyprMasterLayout::onWindowRemovedTiling(PHLWINDOW pWindow) {
@ -280,6 +281,7 @@ void CHyprMasterLayout::onWindowRemovedTiling(PHLWINDOW pWindow) {
}
}
recalculateMonitor(pWindow->monitorID());
pWindow->m_workspace->updateWindows();
}
void CHyprMasterLayout::recalculateMonitor(const MONITORID& monid) {

5
src/managers/KeybindManager.cpp
View file

@ -1769,11 +1769,10 @@ SDispatchResult CKeybindManager::changeGroupActive(std::string args) {
return {};
}
if (args != "b" && args != "prev") {
if (args != "b" && args != "prev")
PWINDOW->setGroupCurrent(PWINDOW->m_groupData.pNextWindow.lock());
} else {
else
PWINDOW->setGroupCurrent(PWINDOW->getGroupPrevious());
}
return {};
}