hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-22 17:05:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

minor focus fixes with LS-es and moving windows

Browse source
This commit is contained in:
vaxerski 2022-12-09 14:03:37 +00:00
parent 629cca4816
commit ff12a41c40
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/managers/KeybindManager.cpp
View file

@ -1015,6 +1015,10 @@ void CKeybindManager::moveActiveToWorkspaceSilent(std::string args) {
// manually post event cuz it got ignored above // manually post event cuz it got ignored above
g_pEventManager->postEvent(SHyprIPCEvent{"movewindow", getFormat("%x,%s", PWINDOW, PWORKSPACE->m_szName.c_str())}); g_pEventManager->postEvent(SHyprIPCEvent{"movewindow", getFormat("%x,%s", PWINDOW, PWORKSPACE->m_szName.c_str())});
// this window is gone. Unfocus if needed
if (g_pCompositor->m_pLastWindow == PWINDOW)
g_pCompositor->focusWindow(nullptr);
g_pInputManager->refocus(); g_pInputManager->refocus();
} }

10
src/managers/input/InputManager.cpp
View file

@ -297,12 +297,16 @@ void CInputManager::mouseMoveUnified(uint32_t time, bool refocus) {
m_bLastFocusOnLS = false; m_bLastFocusOnLS = false;
} else { } else {
if (pFoundLayerSurface) {
m_bLastFocusOnLS = true;
if (pFoundLayerSurface->layer <= ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM) {
g_pCompositor->focusWindow(nullptr);
}
}
if (pFoundLayerSurface && pFoundLayerSurface->layerSurface->current.keyboard_interactive && *PFOLLOWMOUSE != 3 && allowKeyboardRefocus) { if (pFoundLayerSurface && pFoundLayerSurface->layerSurface->current.keyboard_interactive && *PFOLLOWMOUSE != 3 && allowKeyboardRefocus) {
g_pCompositor->focusSurface(foundSurface); g_pCompositor->focusSurface(foundSurface);
} }
if (pFoundLayerSurface)
m_bLastFocusOnLS = true;
} }
wlr_seat_pointer_notify_enter(g_pCompositor->m_sSeat.seat, foundSurface, surfaceLocal.x, surfaceLocal.y); wlr_seat_pointer_notify_enter(g_pCompositor->m_sSeat.seat, foundSurface, surfaceLocal.x, surfaceLocal.y);