mirror of
https://github.com/hyprwm/Hyprland
synced 2024-11-26 21:45:59 +01:00
decos: groupbar mouse interaction (#3102)
* allow groupbar clicking modified: src/Window.cpp modified: src/Window.hpp modified: src/managers/input/InputManager.cpp modified: src/render/decorations/CHyprGroupBarDecoration.cpp modified: src/render/decorations/CHyprGroupBarDecoration.hpp * remove setting pos inside insertWindowToGroup() modified: src/Window.cpp modified: src/layout/DwindleLayout.cpp modified: src/layout/MasterLayout.cpp modified: src/managers/KeybindManager.cpp * add group window by index and group size functions modified: src/Window.cpp modified: src/Window.hpp modified: src/managers/input/InputManager.cpp * allow dragging into groupbar modified: src/Window.cpp modified: src/layout/DwindleLayout.cpp modified: src/layout/MasterLayout.cpp * allow dragging from groupbar modified: src/managers/KeybindManager.cpp * try groupbar clicking before border resize modified: src/managers/input/InputManager.cpp * block grabbing groupbar on floating (crash) remove later when crashing is fixed modified: src/managers/KeybindManager.cpp * remove redundant { } modified: src/layout/DwindleLayout.cpp modified: src/layout/MasterLayout.cpp * implement getWindowDecorationBox() modified: src/Window.cpp modified: src/Window.hpp modified: src/layout/DwindleLayout.cpp modified: src/layout/MasterLayout.cpp modified: src/managers/KeybindManager.cpp modified: src/managers/input/InputManager.cpp modified: src/render/decorations/CHyprDropShadowDecoration.cpp modified: src/render/decorations/CHyprGroupBarDecoration.cpp modified: src/render/decorations/IHyprWindowDecoration.cpp modified: src/render/decorations/IHyprWindowDecoration.hpp * fix crash when moveoutofgroup in floating windows also removes dragging from floating windows limitation modified: src/layout/IHyprLayout.cpp modified: src/managers/KeybindManager.cpp * use CRegion in getWindowDecorationBox() modified: src/helpers/Region.cpp modified: src/helpers/Region.hpp modified: src/layout/DwindleLayout.cpp modified: src/layout/MasterLayout.cpp modified: src/managers/KeybindManager.cpp modified: src/managers/input/InputManager.cpp modified: src/render/decorations/IHyprWindowDecoration.cpp modified: src/render/decorations/IHyprWindowDecoration.hpp * add groupbar scrolling modified: src/config/ConfigManager.cpp modified: src/managers/input/InputManager.cpp * change name to getWindowDecorationRegion() modified: src/layout/DwindleLayout.cpp modified: src/layout/MasterLayout.cpp modified: src/managers/KeybindManager.cpp modified: src/managers/input/InputManager.cpp modified: src/render/decorations/IHyprWindowDecoration.cpp modified: src/render/decorations/IHyprWindowDecoration.hpp * make dragging from group less hacky for floating modified: src/managers/KeybindManager.cpp
This commit is contained in:
parent
c98a00678c
commit
b10cae3010
15 changed files with 206 additions and 82 deletions
|
@ -653,6 +653,27 @@ CWindow* CWindow::getGroupCurrent() {
|
||||||
return curr;
|
return curr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int CWindow::getGroupSize() {
|
||||||
|
int size = 1;
|
||||||
|
CWindow* curr = this;
|
||||||
|
while (curr->m_sGroupData.pNextWindow != this) {
|
||||||
|
curr = curr->m_sGroupData.pNextWindow;
|
||||||
|
size++;
|
||||||
|
}
|
||||||
|
return size;
|
||||||
|
}
|
||||||
|
|
||||||
|
CWindow* CWindow::getGroupWindowByIndex(int index) {
|
||||||
|
const int SIZE = getGroupSize();
|
||||||
|
index = ((index % SIZE) + SIZE) % SIZE;
|
||||||
|
CWindow* curr = getGroupHead();
|
||||||
|
while (index > 0) {
|
||||||
|
curr = curr->m_sGroupData.pNextWindow;
|
||||||
|
index--;
|
||||||
|
}
|
||||||
|
return curr;
|
||||||
|
}
|
||||||
|
|
||||||
void CWindow::setGroupCurrent(CWindow* pWindow) {
|
void CWindow::setGroupCurrent(CWindow* pWindow) {
|
||||||
CWindow* curr = this->m_sGroupData.pNextWindow;
|
CWindow* curr = this->m_sGroupData.pNextWindow;
|
||||||
bool isMember = false;
|
bool isMember = false;
|
||||||
|
@ -701,10 +722,8 @@ void CWindow::setGroupCurrent(CWindow* pWindow) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void CWindow::insertWindowToGroup(CWindow* pWindow) {
|
void CWindow::insertWindowToGroup(CWindow* pWindow) {
|
||||||
static const auto* USECURRPOS = &g_pConfigManager->getConfigValuePtr("misc:group_insert_after_current")->intValue;
|
const auto BEGINAT = this;
|
||||||
|
const auto ENDAT = m_sGroupData.pNextWindow;
|
||||||
const auto BEGINAT = *USECURRPOS ? this : getGroupTail();
|
|
||||||
const auto ENDAT = *USECURRPOS ? m_sGroupData.pNextWindow : getGroupHead();
|
|
||||||
|
|
||||||
if (!pWindow->m_sGroupData.pNextWindow) {
|
if (!pWindow->m_sGroupData.pNextWindow) {
|
||||||
BEGINAT->m_sGroupData.pNextWindow = pWindow;
|
BEGINAT->m_sGroupData.pNextWindow = pWindow;
|
||||||
|
|
|
@ -345,6 +345,8 @@ class CWindow {
|
||||||
CWindow* getGroupTail();
|
CWindow* getGroupTail();
|
||||||
CWindow* getGroupCurrent();
|
CWindow* getGroupCurrent();
|
||||||
CWindow* getGroupPrevious();
|
CWindow* getGroupPrevious();
|
||||||
|
CWindow* getGroupWindowByIndex(int);
|
||||||
|
int getGroupSize();
|
||||||
void setGroupCurrent(CWindow* pWindow);
|
void setGroupCurrent(CWindow* pWindow);
|
||||||
void insertWindowToGroup(CWindow* pWindow);
|
void insertWindowToGroup(CWindow* pWindow);
|
||||||
void updateGroupOutputs();
|
void updateGroupOutputs();
|
||||||
|
|
|
@ -108,6 +108,7 @@ void CConfigManager::setDefaultVars() {
|
||||||
configValues["misc:cursor_zoom_factor"].floatValue = 1.f;
|
configValues["misc:cursor_zoom_factor"].floatValue = 1.f;
|
||||||
configValues["misc:cursor_zoom_rigid"].intValue = 0;
|
configValues["misc:cursor_zoom_rigid"].intValue = 0;
|
||||||
configValues["misc:allow_session_lock_restore"].intValue = 0;
|
configValues["misc:allow_session_lock_restore"].intValue = 0;
|
||||||
|
configValues["misc:groupbar_scrolling"].intValue = 1;
|
||||||
configValues["misc:group_insert_after_current"].intValue = 1;
|
configValues["misc:group_insert_after_current"].intValue = 1;
|
||||||
configValues["misc:render_titles_in_groupbar"].intValue = 1;
|
configValues["misc:render_titles_in_groupbar"].intValue = 1;
|
||||||
configValues["misc:groupbar_titles_font_size"].intValue = 8;
|
configValues["misc:groupbar_titles_font_size"].intValue = 8;
|
||||||
|
|
|
@ -92,6 +92,15 @@ std::vector<pixman_box32_t> CRegion::getRects() const {
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wlr_box CRegion::getExtents() {
|
||||||
|
pixman_box32_t* box = pixman_region32_extents(&m_rRegion);
|
||||||
|
return {box->x1, box->y1, box->x2 - box->x1, box->y2 - box->y1};
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CRegion::containsPoint(const Vector2D& vec) {
|
||||||
|
return pixman_region32_contains_point(&m_rRegion, vec.x, vec.y, nullptr);
|
||||||
|
}
|
||||||
|
|
||||||
bool CRegion::empty() {
|
bool CRegion::empty() {
|
||||||
return !pixman_region32_not_empty(&m_rRegion);
|
return !pixman_region32_not_empty(&m_rRegion);
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,6 +42,8 @@ class CRegion {
|
||||||
CRegion& intersect(double x, double y, double w, double h);
|
CRegion& intersect(double x, double y, double w, double h);
|
||||||
CRegion& translate(const Vector2D& vec);
|
CRegion& translate(const Vector2D& vec);
|
||||||
CRegion& invert(pixman_box32_t* box);
|
CRegion& invert(pixman_box32_t* box);
|
||||||
|
wlr_box getExtents();
|
||||||
|
bool containsPoint(const Vector2D& vec);
|
||||||
bool empty();
|
bool empty();
|
||||||
|
|
||||||
std::vector<pixman_box32_t> getRects() const;
|
std::vector<pixman_box32_t> getRects() const;
|
||||||
|
|
|
@ -312,28 +312,32 @@ void CHyprDwindleLayout::onWindowCreatedTiling(CWindow* pWindow) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const auto MOUSECOORDS = g_pInputManager->getMouseCoordsInternal();
|
||||||
|
|
||||||
// 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 &&
|
if (OPENINGON->pWindow->m_sGroupData.pNextWindow && !OPENINGON->pWindow->getGroupHead()->m_sGroupData.locked &&
|
||||||
!g_pKeybindManager->m_bGroupsLocked) { // target is an unlocked group
|
!g_pKeybindManager->m_bGroupsLocked) { // target is an unlocked group
|
||||||
|
|
||||||
if (!pWindow->m_sGroupData.pNextWindow) { // source is not a group
|
if (!pWindow->m_sGroupData.pNextWindow || !pWindow->getGroupHead()->m_sGroupData.locked) { // source is not a group or an unlocked group
|
||||||
m_lDwindleNodesData.remove(*PNODE);
|
if (!pWindow->m_sGroupData.pNextWindow)
|
||||||
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);
|
m_lDwindleNodesData.remove(*PNODE);
|
||||||
return;
|
|
||||||
|
const wlr_box box = OPENINGON->pWindow->getDecorationByType(DECORATION_GROUPBAR)->getWindowDecorationRegion().getExtents();
|
||||||
|
if (wlr_box_contains_point(&box, MOUSECOORDS.x, MOUSECOORDS.y)) { // TODO: Deny when not using mouse
|
||||||
|
const int SIZE = OPENINGON->pWindow->getGroupSize();
|
||||||
|
const int INDEX = (int)((MOUSECOORDS.x - box.x) * 2 * SIZE / box.width + 1) / 2 - 1;
|
||||||
|
CWindow* pWindowInsertAfter = OPENINGON->pWindow->getGroupWindowByIndex(INDEX);
|
||||||
|
pWindowInsertAfter->insertWindowToGroup(pWindow);
|
||||||
|
if (INDEX == -1)
|
||||||
|
std::swap(pWindow->m_sGroupData.pNextWindow->m_sGroupData.head, pWindow->m_sGroupData.head);
|
||||||
|
} else {
|
||||||
|
static const auto* USECURRPOS = &g_pConfigManager->getConfigValuePtr("misc:group_insert_after_current")->intValue;
|
||||||
|
(*USECURRPOS ? OPENINGON->pWindow : OPENINGON->pWindow->getGroupTail())->insertWindowToGroup(pWindow);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!pWindow->getGroupHead()->m_sGroupData.locked) { // source is an unlocked group
|
|
||||||
m_lDwindleNodesData.remove(*PNODE);
|
|
||||||
OPENINGON->pWindow->insertWindowToGroup(pWindow);
|
|
||||||
OPENINGON->pWindow->setGroupCurrent(pWindow);
|
OPENINGON->pWindow->setGroupCurrent(pWindow);
|
||||||
|
|
||||||
pWindow->updateWindowDecos();
|
pWindow->updateWindowDecos();
|
||||||
recalculateWindow(pWindow);
|
recalculateWindow(pWindow);
|
||||||
|
|
||||||
|
@ -361,8 +365,6 @@ void CHyprDwindleLayout::onWindowCreatedTiling(CWindow* pWindow) {
|
||||||
const auto SIDEBYSIDE = NEWPARENT->size.x > NEWPARENT->size.y * *PWIDTHMULTIPLIER;
|
const auto SIDEBYSIDE = NEWPARENT->size.x > NEWPARENT->size.y * *PWIDTHMULTIPLIER;
|
||||||
NEWPARENT->splitTop = !SIDEBYSIDE;
|
NEWPARENT->splitTop = !SIDEBYSIDE;
|
||||||
|
|
||||||
const auto MOUSECOORDS = g_pInputManager->getMouseCoordsInternal();
|
|
||||||
|
|
||||||
static auto* const PFORCESPLIT = &g_pConfigManager->getConfigValuePtr("dwindle:force_split")->intValue;
|
static auto* const PFORCESPLIT = &g_pConfigManager->getConfigValuePtr("dwindle:force_split")->intValue;
|
||||||
static auto* const PERMANENTDIRECTIONOVERRIDE = &g_pConfigManager->getConfigValuePtr("dwindle:permanent_direction_override")->intValue;
|
static auto* const PERMANENTDIRECTIONOVERRIDE = &g_pConfigManager->getConfigValuePtr("dwindle:permanent_direction_override")->intValue;
|
||||||
static auto* const PSMARTSPLIT = &g_pConfigManager->getConfigValuePtr("dwindle:smart_split")->intValue;
|
static auto* const PSMARTSPLIT = &g_pConfigManager->getConfigValuePtr("dwindle:smart_split")->intValue;
|
||||||
|
|
|
@ -56,6 +56,9 @@ void IHyprLayout::onWindowRemoved(CWindow* pWindow) {
|
||||||
|
|
||||||
pWindow->setHidden(false);
|
pWindow->setHidden(false);
|
||||||
|
|
||||||
|
pWindow->updateWindowDecos();
|
||||||
|
g_pCompositor->updateWindowAnimatedDecorationValues(pWindow);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -91,28 +91,32 @@ void CHyprMasterLayout::onWindowCreatedTiling(CWindow* pWindow) {
|
||||||
getNodeFromWindow(g_pCompositor->m_pLastWindow) :
|
getNodeFromWindow(g_pCompositor->m_pLastWindow) :
|
||||||
getMasterNodeOnWorkspace(pWindow->m_iWorkspaceID);
|
getMasterNodeOnWorkspace(pWindow->m_iWorkspaceID);
|
||||||
|
|
||||||
|
const auto MOUSECOORDS = g_pInputManager->getMouseCoordsInternal();
|
||||||
|
|
||||||
// if it's a group, add the window
|
// if it's a group, add the window
|
||||||
if (OPENINGON && OPENINGON->pWindow->m_sGroupData.pNextWindow && !OPENINGON->pWindow->getGroupHead()->m_sGroupData.locked && !g_pKeybindManager->m_bGroupsLocked &&
|
if (OPENINGON && OPENINGON->pWindow->m_sGroupData.pNextWindow && !OPENINGON->pWindow->getGroupHead()->m_sGroupData.locked && !g_pKeybindManager->m_bGroupsLocked &&
|
||||||
OPENINGON != PNODE) { // target is an unlocked group
|
OPENINGON != PNODE) { // target is an unlocked group
|
||||||
|
|
||||||
if (!pWindow->m_sGroupData.pNextWindow) { // source is not a group
|
if (!pWindow->m_sGroupData.pNextWindow || !pWindow->getGroupHead()->m_sGroupData.locked) { // source is not a group or an unlocked group
|
||||||
m_lMasterNodesData.remove(*PNODE);
|
if (!pWindow->m_sGroupData.pNextWindow)
|
||||||
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);
|
m_lMasterNodesData.remove(*PNODE);
|
||||||
return;
|
|
||||||
|
const wlr_box box = OPENINGON->pWindow->getDecorationByType(DECORATION_GROUPBAR)->getWindowDecorationRegion().getExtents();
|
||||||
|
if (wlr_box_contains_point(&box, MOUSECOORDS.x, MOUSECOORDS.y)) { // TODO: Deny when not using mouse
|
||||||
|
const int SIZE = OPENINGON->pWindow->getGroupSize();
|
||||||
|
const int INDEX = (int)((MOUSECOORDS.x - box.x) * 2 * SIZE / box.width + 1) / 2 - 1;
|
||||||
|
CWindow* pWindowInsertAfter = OPENINGON->pWindow->getGroupWindowByIndex(INDEX);
|
||||||
|
pWindowInsertAfter->insertWindowToGroup(pWindow);
|
||||||
|
if (INDEX == -1)
|
||||||
|
std::swap(pWindow->m_sGroupData.pNextWindow->m_sGroupData.head, pWindow->m_sGroupData.head);
|
||||||
|
} else {
|
||||||
|
static const auto* USECURRPOS = &g_pConfigManager->getConfigValuePtr("misc:group_insert_after_current")->intValue;
|
||||||
|
(*USECURRPOS ? OPENINGON->pWindow : OPENINGON->pWindow->getGroupTail())->insertWindowToGroup(pWindow);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!pWindow->getGroupHead()->m_sGroupData.locked) { // source is an unlocked group
|
|
||||||
m_lMasterNodesData.remove(*PNODE);
|
|
||||||
OPENINGON->pWindow->insertWindowToGroup(pWindow);
|
|
||||||
OPENINGON->pWindow->setGroupCurrent(pWindow);
|
OPENINGON->pWindow->setGroupCurrent(pWindow);
|
||||||
|
|
||||||
pWindow->updateWindowDecos();
|
pWindow->updateWindowDecos();
|
||||||
recalculateWindow(pWindow);
|
recalculateWindow(pWindow);
|
||||||
|
|
||||||
|
@ -631,9 +635,10 @@ void CHyprMasterLayout::resizeActiveWindow(const Vector2D& pixResize, eRectCorne
|
||||||
(PMONITOR->vecSize.y - PMONITOR->vecReservedTopLeft.y - PMONITOR->vecReservedBottomRight.y) / getMastersOnWorkspace(PNODE->workspaceID);
|
(PMONITOR->vecSize.y - PMONITOR->vecReservedTopLeft.y - PMONITOR->vecReservedBottomRight.y) / getMastersOnWorkspace(PNODE->workspaceID);
|
||||||
PNODE->percSize = std::clamp(PNODE->percSize + RESIZEDELTA / SIZE, 0.05, 1.95);
|
PNODE->percSize = std::clamp(PNODE->percSize + RESIZEDELTA / SIZE, 0.05, 1.95);
|
||||||
} else if (!PNODE->isMaster && (getNodesOnWorkspace(PWINDOW->m_iWorkspaceID) - getMastersOnWorkspace(PNODE->workspaceID)) > 1) {
|
} else if (!PNODE->isMaster && (getNodesOnWorkspace(PWINDOW->m_iWorkspaceID) - getMastersOnWorkspace(PNODE->workspaceID)) > 1) {
|
||||||
const auto SIZE = PWORKSPACEDATA->orientation % 2 == 1 ?
|
const auto SIZE = PWORKSPACEDATA->orientation % 2 == 1 ? (PMONITOR->vecSize.x - PMONITOR->vecReservedTopLeft.x - PMONITOR->vecReservedBottomRight.x) /
|
||||||
(PMONITOR->vecSize.x - PMONITOR->vecReservedTopLeft.x - PMONITOR->vecReservedBottomRight.x) / (getNodesOnWorkspace(PNODE->workspaceID) - getMastersOnWorkspace(PNODE->workspaceID)) :
|
(getNodesOnWorkspace(PNODE->workspaceID) - getMastersOnWorkspace(PNODE->workspaceID)) :
|
||||||
(PMONITOR->vecSize.y - PMONITOR->vecReservedTopLeft.y - PMONITOR->vecReservedBottomRight.y) / (getNodesOnWorkspace(PNODE->workspaceID) - getMastersOnWorkspace(PNODE->workspaceID));
|
(PMONITOR->vecSize.y - PMONITOR->vecReservedTopLeft.y - PMONITOR->vecReservedBottomRight.y) /
|
||||||
|
(getNodesOnWorkspace(PNODE->workspaceID) - getMastersOnWorkspace(PNODE->workspaceID));
|
||||||
PNODE->percSize = std::clamp(PNODE->percSize + RESIZEDELTA / SIZE, 0.05, 1.95);
|
PNODE->percSize = std::clamp(PNODE->percSize + RESIZEDELTA / SIZE, 0.05, 1.95);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1226,13 +1226,13 @@ void CKeybindManager::toggleGroup(std::string args) {
|
||||||
w->m_sGroupData.head = false;
|
w->m_sGroupData.head = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool prevState = g_pKeybindManager->m_bGroupsLocked;
|
const bool GROUPSLOCKEDPREV = g_pKeybindManager->m_bGroupsLocked;
|
||||||
g_pKeybindManager->m_bGroupsLocked = true;
|
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 = prevState;
|
g_pKeybindManager->m_bGroupsLocked = GROUPSLOCKEDPREV;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1951,9 +1951,28 @@ void CKeybindManager::mouse(std::string args) {
|
||||||
if (PRESSED) {
|
if (PRESSED) {
|
||||||
g_pKeybindManager->m_bIsMouseBindActive = true;
|
g_pKeybindManager->m_bIsMouseBindActive = true;
|
||||||
|
|
||||||
g_pInputManager->currentlyDraggedWindow = g_pCompositor->vectorToWindowIdeal(g_pInputManager->getMouseCoordsInternal());
|
const auto mouseCoords = g_pInputManager->getMouseCoordsInternal();
|
||||||
g_pInputManager->dragMode = MBIND_MOVE;
|
CWindow* pWindow = g_pCompositor->vectorToWindowIdeal(mouseCoords);
|
||||||
|
|
||||||
|
if (pWindow && !pWindow->m_bIsFullscreen && !pWindow->hasPopupAt(mouseCoords) && pWindow->m_sGroupData.pNextWindow) {
|
||||||
|
const wlr_box box = pWindow->getDecorationByType(DECORATION_GROUPBAR)->getWindowDecorationRegion().getExtents();
|
||||||
|
if (wlr_box_contains_point(&box, mouseCoords.x, mouseCoords.y)) {
|
||||||
|
const int SIZE = pWindow->getGroupSize();
|
||||||
|
pWindow = pWindow->getGroupWindowByIndex((mouseCoords.x - box.x) * SIZE / box.width);
|
||||||
|
|
||||||
|
// hack
|
||||||
|
g_pLayoutManager->getCurrentLayout()->onWindowRemoved(pWindow);
|
||||||
|
if (!pWindow->m_bIsFloating) {
|
||||||
|
const bool GROUPSLOCKEDPREV = g_pKeybindManager->m_bGroupsLocked;
|
||||||
|
g_pKeybindManager->m_bGroupsLocked = true;
|
||||||
|
g_pLayoutManager->getCurrentLayout()->onWindowCreated(pWindow);
|
||||||
|
g_pKeybindManager->m_bGroupsLocked = GROUPSLOCKEDPREV;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
g_pInputManager->currentlyDraggedWindow = pWindow;
|
||||||
|
g_pInputManager->dragMode = MBIND_MOVE;
|
||||||
g_pLayoutManager->getCurrentLayout()->onBeginDragWindow();
|
g_pLayoutManager->getCurrentLayout()->onBeginDragWindow();
|
||||||
} else {
|
} else {
|
||||||
g_pKeybindManager->m_bIsMouseBindActive = false;
|
g_pKeybindManager->m_bIsMouseBindActive = false;
|
||||||
|
@ -2046,7 +2065,7 @@ void CKeybindManager::moveIntoGroup(std::string args) {
|
||||||
if (!PWINDOW || PWINDOW->m_bIsFloating)
|
if (!PWINDOW || PWINDOW->m_bIsFloating)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
const auto PWINDOWINDIR = g_pCompositor->getWindowInDirection(PWINDOW, arg);
|
auto PWINDOWINDIR = g_pCompositor->getWindowInDirection(PWINDOW, arg);
|
||||||
|
|
||||||
if (!PWINDOWINDIR || !PWINDOWINDIR->m_sGroupData.pNextWindow)
|
if (!PWINDOWINDIR || !PWINDOWINDIR->m_sGroupData.pNextWindow)
|
||||||
return;
|
return;
|
||||||
|
@ -2059,6 +2078,9 @@ void CKeybindManager::moveIntoGroup(std::string args) {
|
||||||
|
|
||||||
g_pLayoutManager->getCurrentLayout()->onWindowRemoved(PWINDOW); // This removes groupped property!
|
g_pLayoutManager->getCurrentLayout()->onWindowRemoved(PWINDOW); // This removes groupped property!
|
||||||
|
|
||||||
|
static const auto* USECURRPOS = &g_pConfigManager->getConfigValuePtr("misc:group_insert_after_current")->intValue;
|
||||||
|
PWINDOWINDIR = *USECURRPOS ? PWINDOWINDIR : PWINDOWINDIR->getGroupTail();
|
||||||
|
|
||||||
PWINDOWINDIR->insertWindowToGroup(PWINDOW);
|
PWINDOWINDIR->insertWindowToGroup(PWINDOW);
|
||||||
PWINDOWINDIR->setGroupCurrent(PWINDOW);
|
PWINDOWINDIR->setGroupCurrent(PWINDOW);
|
||||||
PWINDOW->updateWindowDecos();
|
PWINDOW->updateWindowDecos();
|
||||||
|
|
|
@ -545,11 +545,25 @@ void CInputManager::processMouseDownNormal(wlr_pointer_button_event* e) {
|
||||||
if (!PASS && !*PPASSMOUSE)
|
if (!PASS && !*PPASSMOUSE)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
const auto mouseCoords = g_pInputManager->getMouseCoordsInternal();
|
||||||
|
const auto w = g_pCompositor->vectorToWindowIdeal(mouseCoords);
|
||||||
|
|
||||||
|
if (w && !w->m_bIsFullscreen && !w->hasPopupAt(mouseCoords) && w->m_sGroupData.pNextWindow) {
|
||||||
|
const wlr_box box = w->getDecorationByType(DECORATION_GROUPBAR)->getWindowDecorationRegion().getExtents();
|
||||||
|
if (wlr_box_contains_point(&box, mouseCoords.x, mouseCoords.y)) {
|
||||||
|
if (e->state == WLR_BUTTON_PRESSED) {
|
||||||
|
const int SIZE = w->getGroupSize();
|
||||||
|
CWindow* pWindow = w->getGroupWindowByIndex((mouseCoords.x - box.x) * SIZE / box.width);
|
||||||
|
if (w != pWindow)
|
||||||
|
w->setGroupCurrent(pWindow);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// clicking on border triggers resize
|
// clicking on border triggers resize
|
||||||
// TODO detect click on LS properly
|
// TODO detect click on LS properly
|
||||||
if (*PRESIZEONBORDER && !m_bLastFocusOnLS) {
|
if (*PRESIZEONBORDER && !m_bLastFocusOnLS) {
|
||||||
const auto mouseCoords = g_pInputManager->getMouseCoordsInternal();
|
|
||||||
const auto w = g_pCompositor->vectorToWindowIdeal(mouseCoords);
|
|
||||||
if (w && !w->m_bIsFullscreen) {
|
if (w && !w->m_bIsFullscreen) {
|
||||||
const wlr_box real = {w->m_vRealPosition.vec().x, w->m_vRealPosition.vec().y, w->m_vRealSize.vec().x, w->m_vRealSize.vec().y};
|
const wlr_box real = {w->m_vRealPosition.vec().x, w->m_vRealPosition.vec().y, w->m_vRealSize.vec().x, w->m_vRealSize.vec().y};
|
||||||
if ((!wlr_box_contains_point(&real, mouseCoords.x, mouseCoords.y) || w->isInCurvedCorner(mouseCoords.x, mouseCoords.y)) && !w->hasPopupAt(mouseCoords)) {
|
if ((!wlr_box_contains_point(&real, mouseCoords.x, mouseCoords.y) || w->isInCurvedCorner(mouseCoords.x, mouseCoords.y)) && !w->hasPopupAt(mouseCoords)) {
|
||||||
|
@ -614,6 +628,7 @@ void CInputManager::processMouseDownKill(wlr_pointer_button_event* e) {
|
||||||
|
|
||||||
void CInputManager::onMouseWheel(wlr_pointer_axis_event* e) {
|
void CInputManager::onMouseWheel(wlr_pointer_axis_event* e) {
|
||||||
static auto* const PSCROLLFACTOR = &g_pConfigManager->getConfigValuePtr("input:touchpad:scroll_factor")->floatValue;
|
static auto* const PSCROLLFACTOR = &g_pConfigManager->getConfigValuePtr("input:touchpad:scroll_factor")->floatValue;
|
||||||
|
static auto* const PGROUPBARSCROLLING = &g_pConfigManager->getConfigValuePtr("misc:groupbar_scrolling")->intValue;
|
||||||
|
|
||||||
auto factor = (*PSCROLLFACTOR <= 0.f || e->source != WLR_AXIS_SOURCE_FINGER ? 1.f : *PSCROLLFACTOR);
|
auto factor = (*PSCROLLFACTOR <= 0.f || e->source != WLR_AXIS_SOURCE_FINGER ? 1.f : *PSCROLLFACTOR);
|
||||||
|
|
||||||
|
@ -621,6 +636,20 @@ void CInputManager::onMouseWheel(wlr_pointer_axis_event* e) {
|
||||||
|
|
||||||
g_pCompositor->notifyIdleActivity();
|
g_pCompositor->notifyIdleActivity();
|
||||||
|
|
||||||
|
const auto MOUSECOORDS = g_pInputManager->getMouseCoordsInternal();
|
||||||
|
const auto pWindow = g_pCompositor->vectorToWindowIdeal(MOUSECOORDS);
|
||||||
|
|
||||||
|
if (*PGROUPBARSCROLLING && pWindow && !pWindow->m_bIsFullscreen && !pWindow->hasPopupAt(MOUSECOORDS) && pWindow->m_sGroupData.pNextWindow) {
|
||||||
|
const wlr_box box = pWindow->getDecorationByType(DECORATION_GROUPBAR)->getWindowDecorationRegion().getExtents();
|
||||||
|
if (wlr_box_contains_point(&box, MOUSECOORDS.x, MOUSECOORDS.y)) {
|
||||||
|
if (e->delta > 0)
|
||||||
|
pWindow->setGroupCurrent(pWindow->m_sGroupData.pNextWindow);
|
||||||
|
else
|
||||||
|
pWindow->setGroupCurrent(pWindow->getGroupPrevious());
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (passEvent)
|
if (passEvent)
|
||||||
wlr_seat_pointer_notify_axis(g_pCompositor->m_sSeat.seat, e->time_msec, e->orientation, factor * e->delta, std::round(factor * e->delta_discrete), e->source);
|
wlr_seat_pointer_notify_axis(g_pCompositor->m_sSeat.seat, e->time_msec, e->orientation, factor * e->delta, std::round(factor * e->delta_discrete), e->source);
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
#include "../../Compositor.hpp"
|
#include "../../Compositor.hpp"
|
||||||
|
|
||||||
CHyprDropShadowDecoration::CHyprDropShadowDecoration(CWindow* pWindow) {
|
CHyprDropShadowDecoration::CHyprDropShadowDecoration(CWindow* pWindow) : IHyprWindowDecoration(pWindow) {
|
||||||
m_pWindow = pWindow;
|
m_pWindow = pWindow;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
static CTexture m_tGradientActive;
|
static CTexture m_tGradientActive;
|
||||||
static CTexture m_tGradientInactive;
|
static CTexture m_tGradientInactive;
|
||||||
|
|
||||||
CHyprGroupBarDecoration::CHyprGroupBarDecoration(CWindow* pWindow) {
|
CHyprGroupBarDecoration::CHyprGroupBarDecoration(CWindow* pWindow) : IHyprWindowDecoration(pWindow) {
|
||||||
m_pWindow = pWindow;
|
m_pWindow = pWindow;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -306,3 +306,7 @@ void CHyprGroupBarDecoration::refreshGradients() {
|
||||||
renderGradientTo(m_tGradientActive, ((CGradientValueData*)PCOLACTIVE->get())->m_vColors[0]);
|
renderGradientTo(m_tGradientActive, ((CGradientValueData*)PCOLACTIVE->get())->m_vColors[0]);
|
||||||
renderGradientTo(m_tGradientInactive, ((CGradientValueData*)PCOLINACTIVE->get())->m_vColors[0]);
|
renderGradientTo(m_tGradientInactive, ((CGradientValueData*)PCOLINACTIVE->get())->m_vColors[0]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool CHyprGroupBarDecoration::allowsInput() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
|
@ -33,6 +33,8 @@ class CHyprGroupBarDecoration : public IHyprWindowDecoration {
|
||||||
|
|
||||||
virtual SWindowDecorationExtents getWindowDecorationReservedArea();
|
virtual SWindowDecorationExtents getWindowDecorationReservedArea();
|
||||||
|
|
||||||
|
virtual bool allowsInput();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
SWindowDecorationExtents m_seExtents;
|
SWindowDecorationExtents m_seExtents;
|
||||||
|
|
||||||
|
|
|
@ -2,12 +2,29 @@
|
||||||
|
|
||||||
#include "../../Window.hpp"
|
#include "../../Window.hpp"
|
||||||
|
|
||||||
|
IHyprWindowDecoration::IHyprWindowDecoration(CWindow* pWindow) {
|
||||||
|
m_pWindow = pWindow;
|
||||||
|
}
|
||||||
|
|
||||||
IHyprWindowDecoration::~IHyprWindowDecoration() {}
|
IHyprWindowDecoration::~IHyprWindowDecoration() {}
|
||||||
|
|
||||||
SWindowDecorationExtents IHyprWindowDecoration::getWindowDecorationReservedArea() {
|
SWindowDecorationExtents IHyprWindowDecoration::getWindowDecorationReservedArea() {
|
||||||
return SWindowDecorationExtents{};
|
return SWindowDecorationExtents{};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CRegion IHyprWindowDecoration::getWindowDecorationRegion() {
|
||||||
|
const SWindowDecorationExtents RESERVED = getWindowDecorationReservedArea();
|
||||||
|
const int BORDERSIZE = m_pWindow->getRealBorderSize();
|
||||||
|
return CRegion(m_pWindow->m_vRealPosition.vec().x - (BORDERSIZE + RESERVED.topLeft.x) * (int)(RESERVED.topLeft.x != 0),
|
||||||
|
m_pWindow->m_vRealPosition.vec().y - (BORDERSIZE + RESERVED.topLeft.y) * (int)(RESERVED.topLeft.y != 0),
|
||||||
|
m_pWindow->m_vRealSize.vec().x + (BORDERSIZE + RESERVED.topLeft.x) * (int)(RESERVED.topLeft.x != 0) +
|
||||||
|
(BORDERSIZE + RESERVED.bottomRight.x) * (int)(RESERVED.bottomRight.x != 0),
|
||||||
|
m_pWindow->m_vRealSize.vec().y + (BORDERSIZE + RESERVED.topLeft.y) * (int)(RESERVED.topLeft.y != 0) +
|
||||||
|
(BORDERSIZE + RESERVED.bottomRight.y) * (int)(RESERVED.bottomRight.y != 0))
|
||||||
|
.subtract(CRegion(m_pWindow->m_vRealPosition.vec().x - BORDERSIZE, m_pWindow->m_vRealPosition.vec().y - BORDERSIZE, m_pWindow->m_vRealSize.vec().x + 2 * BORDERSIZE,
|
||||||
|
m_pWindow->m_vRealSize.vec().y + 2 * BORDERSIZE));
|
||||||
|
}
|
||||||
|
|
||||||
bool IHyprWindowDecoration::allowsInput() {
|
bool IHyprWindowDecoration::allowsInput() {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
|
@ -1,6 +1,7 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "../../defines.hpp"
|
#include "../../defines.hpp"
|
||||||
|
#include "../../helpers/Region.hpp"
|
||||||
|
|
||||||
enum eDecorationType {
|
enum eDecorationType {
|
||||||
DECORATION_NONE = -1,
|
DECORATION_NONE = -1,
|
||||||
|
@ -19,6 +20,7 @@ class CMonitor;
|
||||||
|
|
||||||
class IHyprWindowDecoration {
|
class IHyprWindowDecoration {
|
||||||
public:
|
public:
|
||||||
|
IHyprWindowDecoration(CWindow*);
|
||||||
virtual ~IHyprWindowDecoration() = 0;
|
virtual ~IHyprWindowDecoration() = 0;
|
||||||
|
|
||||||
virtual SWindowDecorationExtents getWindowDecorationExtents() = 0;
|
virtual SWindowDecorationExtents getWindowDecorationExtents() = 0;
|
||||||
|
@ -33,5 +35,10 @@ class IHyprWindowDecoration {
|
||||||
|
|
||||||
virtual SWindowDecorationExtents getWindowDecorationReservedArea();
|
virtual SWindowDecorationExtents getWindowDecorationReservedArea();
|
||||||
|
|
||||||
|
virtual CRegion getWindowDecorationRegion();
|
||||||
|
|
||||||
virtual bool allowsInput();
|
virtual bool allowsInput();
|
||||||
|
|
||||||
|
private:
|
||||||
|
CWindow* m_pWindow = nullptr;
|
||||||
};
|
};
|
Loading…
Reference in a new issue