hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-12-23 08:09:49 +01:00
Code Issues Projects Releases Packages 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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 69 additions and 29 deletions
Show stats 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(); const auto PTAIL = getGroupTail();
if (pWindow->m_sGroupData.pNextWindow) { if (pWindow->m_sGroupData.pNextWindow) {
const auto PHEAD = pWindow->getGroupHead();
std::vector<CWindow*> members; std::vector<CWindow*> members;
CWindow* curr = pWindow; CWindow* curr = PHEAD;
do { do {
const auto PLAST = curr; const auto PLAST = curr;
members.push_back(curr); members.push_back(curr);
@ -679,7 +680,7 @@ void CWindow::insertWindowToGroup(CWindow* pWindow) {
PLAST->m_sGroupData.pNextWindow = nullptr; PLAST->m_sGroupData.pNextWindow = nullptr;
PLAST->m_sGroupData.head = false; PLAST->m_sGroupData.head = false;
PLAST->m_sGroupData.locked = false; PLAST->m_sGroupData.locked = false;
} while (curr != pWindow); } while (curr != PHEAD);
for (auto& w : members) { for (auto& w : members) {
insertWindowToGroup(w); insertWindowToGroup(w);
@ -690,8 +691,6 @@ void CWindow::insertWindowToGroup(CWindow* pWindow) {
PTAIL->m_sGroupData.pNextWindow = pWindow; PTAIL->m_sGroupData.pNextWindow = pWindow;
pWindow->m_sGroupData.pNextWindow = PHEAD; pWindow->m_sGroupData.pNextWindow = PHEAD;
setGroupCurrent(pWindow);
} }
void CWindow::updateGroupOutputs() { void CWindow::updateGroupOutputs() {

23
src/layout/DwindleLayout.cpp
View file

@ -311,20 +311,35 @@ void CHyprDwindleLayout::onWindowCreatedTiling(CWindow* pWindow) {
} }
// if it's a group, add the window // if it's a group, add the window
if (OPENINGON->pWindow->m_sGroupData.pNextWindow && !OPENINGON->pWindow->getGroupHead()->m_sGroupData.locked && // target is an unlocked group if (OPENINGON->pWindow->m_sGroupData.pNextWindow && !OPENINGON->pWindow->getGroupHead()->m_sGroupData.locked &&
(!pWindow->m_sGroupData.pNextWindow || !pWindow->getGroupHead()->m_sGroupData.locked) // source is not group or is a unlocked group !g_pKeybindManager->m_bGroupsLocked) { // target is an unlocked group
&& !g_pKeybindManager->m_bGroupsLocked) {
m_lDwindleNodesData.remove(*PNODE);
if (!pWindow->m_sGroupData.pNextWindow) { // source is not a group
m_lDwindleNodesData.remove(*PNODE);
OPENINGON->pWindow->insertWindowToGroup(pWindow); OPENINGON->pWindow->insertWindowToGroup(pWindow);
OPENINGON->pWindow->setGroupCurrent(pWindow);
pWindow->m_dWindowDecorations.emplace_back(std::make_unique<CHyprGroupBarDecoration>(pWindow)); pWindow->m_dWindowDecorations.emplace_back(std::make_unique<CHyprGroupBarDecoration>(pWindow));
pWindow->updateWindowDecos(); pWindow->updateWindowDecos();
recalculateWindow(pWindow); recalculateWindow(pWindow);
g_pCompositor->focusWindow(pWindow);
return; return;
} }
if (!pWindow->getGroupHead()->m_sGroupData.locked) { // source is an unlocked group
m_lDwindleNodesData.remove(*PNODE);
OPENINGON->pWindow->insertWindowToGroup(pWindow);
OPENINGON->pWindow->setGroupCurrent(pWindow);
pWindow->updateWindowDecos();
recalculateWindow(pWindow);
g_pCompositor->focusWindow(pWindow);
return;
}
}
// If it's not, get the node under our cursor // If it's not, get the node under our cursor
m_lDwindleNodesData.push_back(SDwindleNodeData()); m_lDwindleNodesData.push_back(SDwindleNodeData());

26
src/layout/MasterLayout.cpp
View file

@ -91,18 +91,36 @@ void CHyprMasterLayout::onWindowCreatedTiling(CWindow* pWindow) {
getNodeFromWindow(g_pCompositor->m_pLastWindow) : getNodeFromWindow(g_pCompositor->m_pLastWindow) :
getMasterNodeOnWorkspace(pWindow->m_iWorkspaceID); getMasterNodeOnWorkspace(pWindow->m_iWorkspaceID);
if (OPENINGON && OPENINGON->pWindow->m_sGroupData.pNextWindow && !OPENINGON->pWindow->getGroupHead()->m_sGroupData.locked && // target is an unlocked group // if it's a group, add the window
(!pWindow->m_sGroupData.pNextWindow || !pWindow->getGroupHead()->m_sGroupData.locked) // source is not group or is an unlocked group if (OPENINGON && OPENINGON->pWindow->m_sGroupData.pNextWindow && !OPENINGON->pWindow->getGroupHead()->m_sGroupData.locked && !g_pKeybindManager->m_bGroupsLocked &&
&& OPENINGON != PNODE && !g_pKeybindManager->m_bGroupsLocked) { OPENINGON != PNODE) { // target is an unlocked group
m_lMasterNodesData.remove(*PNODE);
if (!pWindow->m_sGroupData.pNextWindow) { // source is not a group
m_lMasterNodesData.remove(*PNODE);
OPENINGON->pWindow->insertWindowToGroup(pWindow); OPENINGON->pWindow->insertWindowToGroup(pWindow);
OPENINGON->pWindow->setGroupCurrent(pWindow);
pWindow->m_dWindowDecorations.emplace_back(std::make_unique<CHyprGroupBarDecoration>(pWindow)); pWindow->m_dWindowDecorations.emplace_back(std::make_unique<CHyprGroupBarDecoration>(pWindow));
pWindow->updateWindowDecos();
recalculateWindow(pWindow);
g_pCompositor->focusWindow(pWindow);
return; return;
} }
if (!pWindow->getGroupHead()->m_sGroupData.locked) { // source is an unlocked group
m_lMasterNodesData.remove(*PNODE);
OPENINGON->pWindow->insertWindowToGroup(pWindow);
OPENINGON->pWindow->setGroupCurrent(pWindow);
pWindow->updateWindowDecos();
recalculateWindow(pWindow);
g_pCompositor->focusWindow(pWindow);
return;
}
}
if (*PNEWISMASTER || WINDOWSONWORKSPACE == 1 || (!pWindow->m_bFirstMap && OPENINGON->isMaster)) { if (*PNEWISMASTER || WINDOWSONWORKSPACE == 1 || (!pWindow->m_bFirstMap && OPENINGON->isMaster)) {
for (auto& nd : m_lMasterNodesData) { for (auto& nd : m_lMasterNodesData) {
if (nd.isMaster && nd.workspaceID == PNODE->workspaceID) { if (nd.isMaster && nd.workspaceID == PNODE->workspaceID) {

17
src/managers/KeybindManager.cpp
View file

@ -1174,6 +1174,8 @@ void CKeybindManager::toggleGroup(std::string args) {
if (!PWINDOW) if (!PWINDOW)
return; return;
g_pCompositor->setWindowFullscreen(PWINDOW, false, FULLSCREEN_FULL);
if (!PWINDOW->m_sGroupData.pNextWindow) { if (!PWINDOW->m_sGroupData.pNextWindow) {
PWINDOW->m_sGroupData.pNextWindow = PWINDOW; PWINDOW->m_sGroupData.pNextWindow = PWINDOW;
PWINDOW->m_sGroupData.head = true; PWINDOW->m_sGroupData.head = true;
@ -1205,10 +1207,12 @@ void CKeybindManager::toggleGroup(std::string args) {
w->m_sGroupData.head = false; w->m_sGroupData.head = false;
} }
g_pKeybindManager->m_bGroupsLocked = true;
for (auto& w : members) { for (auto& w : members) {
g_pLayoutManager->getCurrentLayout()->onWindowCreated(w); g_pLayoutManager->getCurrentLayout()->onWindowCreated(w);
w->updateWindowDecos(); w->updateWindowDecos();
} }
g_pKeybindManager->m_bGroupsLocked = false;
} }
} }
@ -2027,14 +2031,19 @@ void CKeybindManager::moveIntoGroup(std::string args) {
if (!PWINDOWINDIR || !PWINDOWINDIR->m_sGroupData.pNextWindow) if (!PWINDOWINDIR || !PWINDOWINDIR->m_sGroupData.pNextWindow)
return; return;
g_pLayoutManager->getCurrentLayout()->onWindowRemoved(PWINDOW); if (!PWINDOW->m_sGroupData.pNextWindow)
PWINDOWINDIR->insertWindowToGroup(PWINDOW);
PWINDOW->m_dWindowDecorations.emplace_back(std::make_unique<CHyprGroupBarDecoration>(PWINDOW)); PWINDOW->m_dWindowDecorations.emplace_back(std::make_unique<CHyprGroupBarDecoration>(PWINDOW));
g_pLayoutManager->getCurrentLayout()->onWindowRemoved(PWINDOW); // This removes groupped property!
PWINDOW->m_sGroupData.locked = false;
PWINDOW->m_sGroupData.head = false;
PWINDOWINDIR->insertWindowToGroup(PWINDOW);
PWINDOWINDIR->setGroupCurrent(PWINDOW);
PWINDOW->updateWindowDecos(); PWINDOW->updateWindowDecos();
g_pLayoutManager->getCurrentLayout()->recalculateWindow(PWINDOW); g_pLayoutManager->getCurrentLayout()->recalculateWindow(PWINDOW);
g_pCompositor->focusWindow(PWINDOW);
} }
void CKeybindManager::moveOutOfGroup(std::string args) { void CKeybindManager::moveOutOfGroup(std::string args) {

7
src/render/decorations/CHyprGroupBarDecoration.cpp
View file

@ -42,7 +42,7 @@ void CHyprGroupBarDecoration::updateWindow(CWindow* pWindow) {
// we draw 3px above the window's border with 3px // we draw 3px above the window's border with 3px
static auto* const PBORDERSIZE = &g_pConfigManager->getConfigValuePtr("general:border_size")->intValue; static auto* const PBORDERSIZE = &g_pConfigManager->getConfigValuePtr("general:border_size")->intValue;
m_seExtents.topLeft = Vector2D(0, *PBORDERSIZE + BAR_PADDING_OUTER_VERT * 2 + BAR_INDICATOR_HEIGHT + (*PRENDERTITLES ? *PTITLEFONTSIZE : 0)); m_seExtents.topLeft = Vector2D(0, *PBORDERSIZE + BAR_PADDING_OUTER_VERT * 2 + BAR_INDICATOR_HEIGHT + (*PRENDERTITLES ? *PTITLEFONTSIZE : 0) + 2);
m_seExtents.bottomRight = Vector2D(); m_seExtents.bottomRight = Vector2D();
m_vLastWindowPos = pWindow->m_vRealPosition.vec() + WORKSPACEOFFSET; m_vLastWindowPos = pWindow->m_vRealPosition.vec() + WORKSPACEOFFSET;
@ -80,9 +80,8 @@ void CHyprGroupBarDecoration::updateWindow(CWindow* pWindow) {
} }
void CHyprGroupBarDecoration::damageEntire() { void CHyprGroupBarDecoration::damageEntire() {
const auto EXTENTS = getWindowDecorationReservedArea(); wlr_box dm = {m_vLastWindowPos.x - m_seExtents.topLeft.x, m_vLastWindowPos.y - m_seExtents.topLeft.y, m_vLastWindowSize.x + m_seExtents.topLeft.x + m_seExtents.bottomRight.x,
wlr_box dm = {m_vLastWindowPos.x - m_seExtents.topLeft.x + EXTENTS.topLeft.x, m_vLastWindowPos.y - m_seExtents.topLeft.y + EXTENTS.topLeft.y - 2, m_seExtents.topLeft.y};
m_vLastWindowSize.x + m_seExtents.topLeft.x + m_seExtents.bottomRight.x, m_seExtents.topLeft.y};
g_pHyprRenderer->damageBox(&dm); g_pHyprRenderer->damageBox(&dm);
} }