hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2026-05-07 06:18:05 +02:00
Code Issues Projects Releases Packages Wiki Activity

groups: fix movewindoworgroup when moving from group to group (#14086)

Browse source 
* Add test for movewindowgroup

* groups: Fix `movewindoworgroup` moving into group

Fixes `CKeybindManager::moveWindowIntoGroup` to
remove a window from a group before attempting
to add it to another group. Addresses #13843.

But the animation of moving a window from a group
into another group now looks weird: as if the
whole target group is being moved.
This commit is contained in:
Nikolai Nechaev 2026-04-17 01:54:04 +09:00 • committed by GitHub
parent 1ea0a43615
commit ff459f4a2a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 61 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
hyprtester/src/tests/main/groups.cpp
View file

@ -25,6 +25,65 @@ static bool test() {
NLog::log("{}Dispatching workspace `groups`", Colors::YELLOW);
getFromSocket("/dispatch workspace name:groups");
NLog::log("{}Testing movewindoworgroup from group to group", Colors::YELLOW);
auto kittyA = Tests::spawnKitty("kittyA");
if (!kittyA) {
NLog::log("{}Error: kitty did not spawn", Colors::RED);
return false;
}
// check kitty properties. One kitty should take the entire screen, minus the gaps.
NLog::log("{}Check kittyA dimensions", Colors::YELLOW);
{
auto str = getFromSocket("/clients");
EXPECT_COUNT_STRING(str, "at: 22,22", 1);
EXPECT_COUNT_STRING(str, "size: 1876,1036", 1);
EXPECT_COUNT_STRING(str, "fullscreen: 0", 1);
}
auto kittyB = Tests::spawnKitty("kittyB");
if (!kittyB) {
NLog::log("{}Error: kitty did not spawn", Colors::RED);
return false;
}
OK(getFromSocket("/dispatch focuswindow class:kittyB"));
OK(getFromSocket("/dispatch togglegroup"));
OK(getFromSocket("/dispatch focuswindow class:kittyA"));
OK(getFromSocket("/dispatch togglegroup"));
NLog::log("{}Check kittyB dimensions", Colors::YELLOW);
{
auto str = getFromSocket("/activewindow");
EXPECT_COUNT_STRING(str, "size: 931,1015", 1);
EXPECT_COUNT_STRING(str, "fullscreen: 0", 1);
}
auto kittyC = Tests::spawnKitty("kittyC");
if (!kittyC) {
NLog::log("{}Error: kitty did not spawn", Colors::RED);
return false;
}
NLog::log("{}Check kittyC dimensions", Colors::YELLOW);
{
auto str = getFromSocket("/activewindow");
EXPECT_COUNT_STRING(str, "size: 931,1015", 1);
EXPECT_COUNT_STRING(str, "fullscreen: 0", 1);
}
OK(getFromSocket("/dispatch movewindoworgroup r"));
NLog::log("{}Check that dimensions remain the same after move", Colors::YELLOW);
{
auto str = getFromSocket("/activewindow");
EXPECT_COUNT_STRING(str, "size: 931,1015", 1);
EXPECT_COUNT_STRING(str, "fullscreen: 0", 1);
}
// kill all
NLog::log("{}Kill windows", Colors::YELLOW);
Tests::killAllWindows();
NLog::log("{}Spawning kittyProcA", Colors::YELLOW);
auto kittyProcA = Tests::spawnKitty();
if (!kittyProcA) {

2
src/managers/KeybindManager.cpp
View file

@ -2625,6 +2625,8 @@ void CKeybindManager::moveWindowIntoGroup(PHLWINDOW pWindow, PHLWINDOW pWindowIn
pWindow->m_monitor = pWindowInDirection->m_monitor;
}
if (pWindow->m_group)
pWindow->m_group->remove(pWindow);
pWindowInDirection->m_group->add(pWindow);
pWindowInDirection->m_group->setCurrent(pWindow);