summaryrefslogtreecommitdiff
path: root/src/render
diff options
context:
space:
mode:
authorMightyPlaza <123664421+MightyPlaza@users.noreply.github.com>2023-10-30 14:54:12 +0000
committerGitHub <noreply@github.com>2023-10-30 14:54:12 +0000
commita1924ae4356657a06e43e740f1cf2e1634fa958d (patch)
tree3d73c334ec5bb22b956f8c0293ac61234fe11a9d /src/render
parentcb6cfde6e82f9b146ba1bd937472aa17ec829167 (diff)
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
Diffstat (limited to 'src/render')
-rw-r--r--src/render/decorations/CHyprGroupBarDecoration.cpp7
1 files changed, 1 insertions, 6 deletions
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;