Trensa-Organization/hy3
1
0
Fork 0
mirror of https://github.com/Trensa-Organization/hy3.git synced 2025-03-15 10:43:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add floating window support to hy3:movefocus

Browse source
This commit is contained in:
outfoxxed 2023-12-06 02:55:12 -08:00
parent 6a89b574c7
commit c727ad11e3
No known key found for this signature in database
GPG key ID: 4C88A185FB89301E
1 changed files with 44 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/Hy3Layout.cpp
View file

@ -698,7 +698,7 @@ CWindow* Hy3Layout::getNextWindowCandidate(CWindow* window) {
// return the first floating window on the same workspace that has not asked not to be focused
if (window->m_bIsFloating) {
for (std::unique_ptr<CWindow>& w: g_pCompositor->m_vWindows | std::views::reverse) {
for (auto& w: g_pCompositor->m_vWindows | std::views::reverse) {
if (w->m_bIsMapped && !w->isHidden() && w->m_bIsFloating && w->m_iX11Type != 2
&& w->m_iWorkspaceID == window->m_iWorkspaceID && !w->m_bX11ShouldntFocus
&& !w->m_bNoFocus && w.get() != window)
@ -937,10 +937,53 @@ void Hy3Layout::shiftWindow(int workspace, ShiftDirection direction, bool once,
}
void Hy3Layout::shiftFocus(int workspace, ShiftDirection direction, bool visible) {
auto* current_window = g_pCompositor->m_pLastWindow;
auto* p_workspace = g_pCompositor->getWorkspaceByID(current_window->m_iWorkspaceID);
if (p_workspace->m_bHasFullscreenWindow) return;
if (current_window != nullptr && current_window->m_bIsFloating) {
CWindow* next_window = nullptr;
double next_distance = -1;
for (auto& w: g_pCompositor->m_vWindows) {
if (w->m_bIsMapped && !w->isHidden() && w->m_bIsFloating && w->m_iX11Type != 2
&& w->m_iWorkspaceID == current_window->m_iWorkspaceID && !w->m_bX11ShouldntFocus
&& !w->m_bNoFocus && w.get() != current_window)
{
double distance = 0;
auto cpos = current_window->m_vRealPosition.vec() + (current_window->m_vRealSize.vec() / 2);
auto tpos = w->m_vRealPosition.vec() + (w->m_vRealSize.vec() / 2);
auto x_offset = tpos.x - cpos.x;
auto y_offset = tpos.y - cpos.y;
if (abs(x_offset) > abs(y_offset)) {
if (x_offset < 0 && direction == ShiftDirection::Left) distance = -x_offset;
else if (x_offset > 0 && direction == ShiftDirection::Right) distance = x_offset;
} else {
if (y_offset < 0 && direction == ShiftDirection::Up) distance = -y_offset;
else if (y_offset > 0 && direction == ShiftDirection::Down) distance = y_offset;
}
if (distance <= 0) continue;
if (next_distance == -1 || distance < next_distance) {
next_window = w.get();
next_distance = distance;
}
}
}
if (next_window != nullptr) g_pCompositor->focusWindow(next_window);
return;
}
auto* node = this->getWorkspaceFocusedNode(workspace);
if (node == nullptr) return;
auto* target = this->shiftOrGetFocus(*node, direction, false, false, visible);
if (target != nullptr) {
target->focus();
while (target->parent != nullptr) target = target->parent;