diff options
Diffstat (limited to 'src/layout')
| -rw-r--r-- | src/layout/DwindleLayout.cpp | 30 | ||||
| -rw-r--r-- | src/layout/IHyprLayout.cpp | 8 | ||||
| -rw-r--r-- | src/layout/IHyprLayout.hpp | 10 |
3 files changed, 24 insertions, 24 deletions
diff --git a/src/layout/DwindleLayout.cpp b/src/layout/DwindleLayout.cpp index fb420f8e..4e4f0829 100644 --- a/src/layout/DwindleLayout.cpp +++ b/src/layout/DwindleLayout.cpp @@ -139,7 +139,7 @@ SDwindleNodeData* CHyprDwindleLayout::getMasterNodeOnWorkspace(const int& id) { void CHyprDwindleLayout::applyNodeDataToWindow(SDwindleNodeData* pNode, bool force) { // Don't set nodes, only windows. - if (pNode->isNode) + if (pNode->isNode) return; CMonitor* PMONITOR = nullptr; @@ -300,7 +300,7 @@ void CHyprDwindleLayout::onWindowCreatedTiling(CWindow* pWindow) { // happens on reserved area if (!OPENINGON && g_pCompositor->getWindowsOnWorkspace(PNODE->workspaceID) > 0) OPENINGON = getFirstNodeOnWorkspace(PMONITOR->activeWorkspace); - + } else if (*PUSEACTIVE) { if (g_pCompositor->windowValidMapped(g_pCompositor->m_pLastWindow) && !g_pCompositor->m_pLastWindow->m_bIsFloating && g_pCompositor->m_pLastWindow != pWindow && g_pCompositor->m_pLastWindow->m_iWorkspaceID == pWindow->m_iWorkspaceID && g_pCompositor->m_pLastWindow->m_bIsMapped) { OPENINGON = getNodeFromWindow(g_pCompositor->m_pLastWindow); @@ -370,7 +370,7 @@ void CHyprDwindleLayout::onWindowCreatedTiling(CWindow* pWindow) { return; } - + // If it's not, get the node under our cursor m_lDwindleNodesData.push_back(SDwindleNodeData()); @@ -413,7 +413,7 @@ void CHyprDwindleLayout::onWindowCreatedTiling(CWindow* pWindow) { NEWPARENT->children[1] = PNODE; } } - + // and update the previous parent if it exists if (OPENINGON->pParent) { if (OPENINGON->pParent->children[0] == OPENINGON) { @@ -424,7 +424,7 @@ void CHyprDwindleLayout::onWindowCreatedTiling(CWindow* pWindow) { } // Update the children - + if (NEWPARENT->size.x * *PWIDTHMULTIPLIER > NEWPARENT->size.y) { // split left/right @@ -473,7 +473,7 @@ void CHyprDwindleLayout::onWindowRemovedTiling(CWindow* pWindow) { if (PNODE->groupHead) { PNEXT->groupHead = true; PNEXT->pParent = PNODE->pParent; - + if (PNODE->pParent) { if (PNODE->pParent->children[0] == PNODE) { PNODE->pParent->children[0] = PNEXT; @@ -502,7 +502,7 @@ void CHyprDwindleLayout::onWindowRemovedTiling(CWindow* pWindow) { // means we dissolved the group recalculateMonitor(PNEXT->pWindow->m_iMonitorID); } - + return; } @@ -533,7 +533,7 @@ void CHyprDwindleLayout::onWindowRemovedTiling(CWindow* pWindow) { if (PSIBLING->pParent) PSIBLING->pParent->recalcSizePosRecursive(); - else + else PSIBLING->recalcSizePosRecursive(); m_lDwindleNodesData.remove(*PPARENT); @@ -809,7 +809,7 @@ void CHyprDwindleLayout::toggleWindowGroup(CWindow* pWindow) { PNODE->pWindow->m_bIsFloating = PHEAD->pWindow->m_bIsFloating; std::deque<CWindow*> toAddWindows; - + const auto PWINDOWNODE = PNODE->pWindow; toAddWindows.push_back(PWINDOWNODE); @@ -821,13 +821,13 @@ void CHyprDwindleLayout::toggleWindowGroup(CWindow* pWindow) { PWINDOW->m_bHidden = false; } - + if (PHEAD->pPreviousGroupMember) PHEAD->pPreviousGroupMember->pNextGroupMember = PHEAD->pNextGroupMember; if (PHEAD->pNextGroupMember) PHEAD->pNextGroupMember->pPreviousGroupMember = PHEAD->pPreviousGroupMember; - + PHEAD->pPreviousGroupMember = nullptr; PHEAD->pNextGroupMember = nullptr; @@ -921,7 +921,7 @@ void CHyprDwindleLayout::toggleWindowGroup(CWindow* pWindow) { } std::deque<CWindow*> CHyprDwindleLayout::getGroupMembers(CWindow* pWindow) { - + std::deque<CWindow*> result; if (!g_pCompositor->windowExists(pWindow)) @@ -985,7 +985,7 @@ void CHyprDwindleLayout::switchGroupWindow(CWindow* pWindow, bool forward, CWind g_pCompositor->focusWindow(pNewNode->pWindow); pNewNode->pWindow->m_bIsFloating = PNODE->pWindow->m_bIsFloating; - + if (PNODE->pWindow->m_bIsFullscreen) { PNODE->pWindow->m_bHidden = false; g_pCompositor->setWindowFullscreen(PNODE->pWindow, false, PWORKSPACE->m_efFullscreenMode); @@ -1104,7 +1104,7 @@ void CHyprDwindleLayout::switchWindows(CWindow* pWindow, CWindow* pWindow2) { // recalc the workspace getMasterNodeOnWorkspace(PNODE->workspaceID)->recalcSizePosRecursive(); - + if (PNODE2->workspaceID != PNODE->workspaceID) { getMasterNodeOnWorkspace(PNODE2->workspaceID)->recalcSizePosRecursive(); } @@ -1150,7 +1150,7 @@ std::any CHyprDwindleLayout::layoutMessage(SLayoutMessageHeader header, std::str auto res = getGroupMembers(header.pWindow ? header.pWindow : g_pCompositor->m_pLastWindow); return res; } - + return ""; } diff --git a/src/layout/IHyprLayout.cpp b/src/layout/IHyprLayout.cpp index 8984a107..9f2e9e07 100644 --- a/src/layout/IHyprLayout.cpp +++ b/src/layout/IHyprLayout.cpp @@ -50,7 +50,7 @@ void IHyprLayout::onWindowCreatedFloating(CWindow* pWindow) { pWindow->m_bHidden = true; return; } - + // reject any windows with size <= 5x5 if (pWindow->m_vRealSize.goalv().x <= 5 || pWindow->m_vRealSize.goalv().y <= 5) { pWindow->m_vRealSize = PMONITOR->vecSize / 2.f; @@ -207,7 +207,7 @@ void IHyprLayout::onMouseMove(const Vector2D& mousePos) { DRAGGINGWINDOW->m_vRealSize.setValueAndWarp(m_vBeginDragSizeXY + DELTA); DRAGGINGWINDOW->m_vRealSize.setValueAndWarp(Vector2D(std::clamp(DRAGGINGWINDOW->m_vRealSize.vec().x, (double)20, (double)MAXSIZE.x), std::clamp(DRAGGINGWINDOW->m_vRealSize.vec().y, (double)20, (double)MAXSIZE.y))); } - + g_pXWaylandManager->setWindowSize(DRAGGINGWINDOW, DRAGGINGWINDOW->m_vRealSize.goalv()); } else { resizeActiveWindow(TICKDELTA, DRAGGINGWINDOW); @@ -223,7 +223,7 @@ void IHyprLayout::onMouseMove(const Vector2D& mousePos) { if (PMONITOR) { DRAGGINGWINDOW->m_iMonitorID = PMONITOR->ID; DRAGGINGWINDOW->moveToWorkspace(PMONITOR->activeWorkspace); - + DRAGGINGWINDOW->updateToplevel(); } @@ -302,4 +302,4 @@ void IHyprLayout::moveActiveWindow(const Vector2D& delta, CWindow* pWindow) { PWINDOW->m_vRealPosition = PWINDOW->m_vRealPosition.goalv() + delta; g_pHyprRenderer->damageWindow(PWINDOW); -}
\ No newline at end of file +} diff --git a/src/layout/IHyprLayout.hpp b/src/layout/IHyprLayout.hpp index 29f47405..05f8800c 100644 --- a/src/layout/IHyprLayout.hpp +++ b/src/layout/IHyprLayout.hpp @@ -79,7 +79,7 @@ public: */ virtual void onEndDragWindow(); /* - Called whenever the mouse moves, should the layout want to + Called whenever the mouse moves, should the layout want to do anything with it. Useful for dragging. */ @@ -94,19 +94,19 @@ public: /* Called when a dispatcher requests a custom message - The layout is free to ignore. + The layout is free to ignore. std::any is the reply. Can be empty. */ virtual std::any layoutMessage(SLayoutMessageHeader, std::string) = 0; - /* + /* Required to be handled, but may return just SWindowRenderLayoutHints() Called when the renderer requests any special draw flags for a specific window, e.g. border color for groups. */ virtual SWindowRenderLayoutHints requestRenderHints(CWindow*) = 0; - /* + /* Called when the user requests two windows to be swapped places. The layout is free to ignore. */ @@ -128,4 +128,4 @@ private: Vector2D m_vLastDragXY; Vector2D m_vBeginDragPositionXY; Vector2D m_vBeginDragSizeXY; -};
\ No newline at end of file +}; |
