From a1924ae4356657a06e43e740f1cf2e1634fa958d Mon Sep 17 00:00:00 2001 From: MightyPlaza <123664421+MightyPlaza@users.noreply.github.com> Date: Mon, 30 Oct 2023 14:54:12 +0000 Subject: internal: create canBeGroupedInto() (#3693) modified: src/Window.cpp modified: src/Window.hpp modified: src/layout/DwindleLayout.cpp modified: src/layout/MasterLayout.cpp modified: src/render/decorations/CHyprGroupBarDecoration.cpp --- src/render/decorations/CHyprGroupBarDecoration.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/render') diff --git a/src/render/decorations/CHyprGroupBarDecoration.cpp b/src/render/decorations/CHyprGroupBarDecoration.cpp index 280fe921..7f9fcde9 100644 --- a/src/render/decorations/CHyprGroupBarDecoration.cpp +++ b/src/render/decorations/CHyprGroupBarDecoration.cpp @@ -307,12 +307,7 @@ bool CHyprGroupBarDecoration::allowsInput() { bool CHyprGroupBarDecoration::onEndWindowDragOnDeco(CWindow* pDraggedWindow, const Vector2D& pos) { - if (!(!g_pKeybindManager->m_bGroupsLocked // global group lock disengaged - && ((pDraggedWindow->m_eGroupRules & GROUP_INVADE && pDraggedWindow->m_bFirstMap) // window ignore local group locks, or - || (!m_pWindow->getGroupHead()->m_sGroupData.locked // target unlocked - && !(pDraggedWindow->m_sGroupData.pNextWindow && pDraggedWindow->getGroupHead()->m_sGroupData.locked))) // source unlocked or isn't group - && !pDraggedWindow->m_sGroupData.deny // source is not denied entry - && !(pDraggedWindow->m_eGroupRules & GROUP_BARRED && pDraggedWindow->m_bFirstMap))) // group rule doesn't prevent adding window + if (!pDraggedWindow->canBeGroupedInto(m_pWindow)) return true; const float BARRELATIVEX = pos.x - m_vLastWindowPos.x - m_fBarWidth / 2; -- cgit v1.2.3