twin/hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2025-08-07 07:31:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

groupbar fixes (#2630)

Browse Source 
Fixes multiple groupbar decoration issues:

  -  togglegroup removes fullscreen to avoid to avoid weird state
 -   fixes issue where a group had multiple windows with head = true
 -   fixes issue where merging 2 groups would cause a window to have 2 groupbar decorations
  -  fixes issue where merging a group with more than 1 window into another group would make windows have no groupbar decoration
  -  fixes issue where ungrouping windows could just move them into another group on the same workspace


---------

Co-authored-by: vaxerski <43317083+vaxerski@users.noreply.github.com>
This commit is contained in:
MightyPlaza
2023-07-03 10:49:56 +00:00
committed by GitHub
parent 738ec900f4
commit 05047f60f4
5 changed files with 69 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Window.cpp
View File

@@ -670,8 +670,9 @@ void CWindow::insertWindowToGroup(CWindow* pWindow) {
const auto PTAIL = getGroupTail();
if (pWindow->m_sGroupData.pNextWindow) {
const auto PHEAD = pWindow->getGroupHead();
std::vector<CWindow*> members;
CWindow* curr = pWindow;
CWindow* curr = PHEAD;
do {
const auto PLAST = curr;
members.push_back(curr);
@@ -679,7 +680,7 @@ void CWindow::insertWindowToGroup(CWindow* pWindow) {
PLAST->m_sGroupData.pNextWindow = nullptr;
PLAST->m_sGroupData.head = false;
PLAST->m_sGroupData.locked = false;
} while (curr != pWindow);
} while (curr != PHEAD);
for (auto& w : members) {
insertWindowToGroup(w);
@@ -690,8 +691,6 @@ void CWindow::insertWindowToGroup(CWindow* pWindow) {
PTAIL->m_sGroupData.pNextWindow = pWindow;
pWindow->m_sGroupData.pNextWindow = PHEAD;
setGroupCurrent(pWindow);
}
void CWindow::updateGroupOutputs() {