From f45ec2497735851cd3d361278abaa7e58ec08b2a Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Sat, 26 Nov 2022 00:00:36 +0000 Subject: [PATCH] don't focus back after dnd on follow mouse 1 --- src/events/Misc.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/events/Misc.cpp b/src/events/Misc.cpp index 1edea5ba..c78a0698 100644 --- a/src/events/Misc.cpp +++ b/src/events/Misc.cpp @@ -126,6 +126,8 @@ void Events::listener_startDrag(wl_listener* listener, void* data) { void Events::listener_destroyDrag(void* owner, void* data) { Debug::log(LOG, "Drag destroyed."); + static auto *const PFOLLOWMOUSE = &g_pConfigManager->getConfigValuePtr("input:follow_mouse")->intValue; + if (g_pInputManager->m_sDrag.drag && g_pInputManager->m_sDrag.dragIcon && g_pInputManager->m_sDrag.dragIcon->surface) g_pHyprRenderer->damageBox(g_pInputManager->m_sDrag.pos.x - 2, g_pInputManager->m_sDrag.pos.y - 2, g_pInputManager->m_sDrag.dragIcon->surface->current.width + 4, g_pInputManager->m_sDrag.dragIcon->surface->current.height + 4); @@ -135,7 +137,7 @@ void Events::listener_destroyDrag(void* owner, void* data) { g_pInputManager->refocus(); - if (g_pInputManager->m_pFollowOnDnDBegin) + if (g_pInputManager->m_pFollowOnDnDBegin && *PFOLLOWMOUSE != 1) g_pCompositor->focusWindow(g_pInputManager->m_pFollowOnDnDBegin); g_pInputManager->m_pFollowOnDnDBegin = nullptr;