hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-12-23 04:09:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix refocus shenanigans with window data

Browse source
This commit is contained in:
Vaxry 2022-08-08 20:21:11 +02:00
parent 9532ff4287
commit bf9d358d3b
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Compositor.cpp
View file

@ -615,7 +615,17 @@ void CCompositor::focusWindow(CWindow* pWindow, wlr_surface* pSurface) {
} }
if (!pWindow || !windowValidMapped(pWindow)) { if (!pWindow || !windowValidMapped(pWindow)) {
if (windowValidMapped(m_pLastWindow)) {
updateWindowAnimatedDecorationValues(m_pLastWindow);
if (m_pLastWindow->m_phForeignToplevel)
wlr_foreign_toplevel_handle_v1_set_activated(m_pLastWindow->m_phForeignToplevel, false);
}
wlr_seat_keyboard_notify_clear_focus(m_sSeat.seat); wlr_seat_keyboard_notify_clear_focus(m_sSeat.seat);
m_pLastWindow = nullptr;
m_pLastFocus = nullptr;
return; return;
} }

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

@ -210,9 +210,7 @@ void CInputManager::mouseMoveUnified(uint32_t time, bool refocus) {
wlr_seat_pointer_clear_focus(g_pCompositor->m_sSeat.seat); wlr_seat_pointer_clear_focus(g_pCompositor->m_sSeat.seat);
if (refocus) { // if we are forcing a refocus, and we don't find a surface, clear the kb focus too! if (refocus) { // if we are forcing a refocus, and we don't find a surface, clear the kb focus too!
g_pCompositor->focusSurface(nullptr); g_pCompositor->focusWindow(nullptr);
g_pCompositor->m_pLastWindow = nullptr;
} }
return; return;