diff options
| author | Aqa-Ib <[email protected]> | 2024-10-27 00:44:55 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-10-27 01:44:55 +0100 |
| commit | a3d3b4fd64a51a8c1663b450bd2a408f1f0fa9b3 (patch) | |
| tree | 366ac8c01ab2e9a463f089e2b30129b413a38269 /src/render | |
| parent | f3f7d3629a632682b1b3acf800f0b5fb10cd48f4 (diff) | |
| download | Hyprland-a3d3b4fd64a51a8c1663b450bd2a408f1f0fa9b3.tar.gz Hyprland-a3d3b4fd64a51a8c1663b450bd2a408f1f0fa9b3.zip | |
groups: fix swallowing (#8223)
* fix swallowing for groups
* remove unnecessary check
* clang-format
* clarify comment
* make variables consistent
* make aditional variables consistent
Diffstat (limited to 'src/render')
| -rw-r--r-- | src/render/decorations/CHyprGroupBarDecoration.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/render/decorations/CHyprGroupBarDecoration.cpp b/src/render/decorations/CHyprGroupBarDecoration.cpp index 4219a5a8..1868bb5c 100644 --- a/src/render/decorations/CHyprGroupBarDecoration.cpp +++ b/src/render/decorations/CHyprGroupBarDecoration.cpp @@ -405,12 +405,9 @@ bool CHyprGroupBarDecoration::onEndWindowDragOnDeco(const Vector2D& pos, PHLWIND static auto PSTACKED = CConfigValue<Hyprlang::INT>("group:groupbar:stacked"); static auto PDRAGINTOGROUP = CConfigValue<Hyprlang::INT>("group:drag_into_group"); static auto PMERGEFLOATEDINTOTILEDONGROUPBAR = CConfigValue<Hyprlang::INT>("group:merge_floated_into_tiled_on_groupbar"); + const bool FLOATEDINTOTILED = !m_pWindow->m_bIsFloating && !pDraggedWindow->m_bDraggingTiled; - bool denied = false; - if (!m_pWindow->m_bIsFloating && !pDraggedWindow->m_bDraggingTiled && !*PMERGEFLOATEDINTOTILEDONGROUPBAR) - denied = true; - - if (!pDraggedWindow->canBeGroupedInto(m_pWindow.lock()) || (*PDRAGINTOGROUP != 1 && *PDRAGINTOGROUP != 2) || denied) + if (!pDraggedWindow->canBeGroupedInto(m_pWindow.lock()) || (*PDRAGINTOGROUP != 1 && *PDRAGINTOGROUP != 2) || (FLOATEDINTOTILED && !*PMERGEFLOATEDINTOTILEDONGROUPBAR)) return false; const float BARRELATIVE = *PSTACKED ? pos.y - assignedBoxGlobal().y - (m_fBarHeight + BAR_PADDING_OUTER_VERT) / 2 : pos.x - assignedBoxGlobal().x - m_fBarWidth / 2; |