diff options
| author | MightyPlaza <[email protected]> | 2024-07-24 22:19:15 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-07-25 00:19:15 +0200 |
| commit | 4beac91cbd791657cc53d6e483eb41bf4df1ec0c (patch) | |
| tree | cb422a567275528b28bc5c7b7f702a6f617bc9b5 | |
| parent | 391f1ae838e936e909d0f3de8a5bf0387d22f80d (diff) | |
| download | Hyprland-4beac91cbd791657cc53d6e483eb41bf4df1ec0c.tar.gz Hyprland-4beac91cbd791657cc53d6e483eb41bf4df1ec0c.zip | |
keybinds: add safeguard to mousebinds (#7034)
modified: src/managers/KeybindManager.cpp
| -rw-r--r-- | src/managers/KeybindManager.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp index 44826fff..caa2b137 100644 --- a/src/managers/KeybindManager.cpp +++ b/src/managers/KeybindManager.cpp @@ -2366,7 +2366,7 @@ void CKeybindManager::mouse(std::string args) { const auto PRESSED = args[0] == '1'; if (ARGS[0] == "movewindow") { - if (PRESSED) { + if (PRESSED && g_pInputManager->dragMode == MBIND_INVALID) { g_pKeybindManager->m_bIsMouseBindActive = true; const auto mouseCoords = g_pInputManager->getMouseCoordsInternal(); @@ -2380,7 +2380,7 @@ void CKeybindManager::mouse(std::string args) { g_pInputManager->dragMode = MBIND_MOVE; g_pLayoutManager->getCurrentLayout()->onBeginDragWindow(); - } else { + } else if (!PRESSED && g_pInputManager->dragMode == MBIND_MOVE) { g_pKeybindManager->m_bIsMouseBindActive = false; if (!g_pInputManager->currentlyDraggedWindow.expired()) { @@ -2390,7 +2390,7 @@ void CKeybindManager::mouse(std::string args) { } } } else if (ARGS[0] == "resizewindow") { - if (PRESSED) { + if (PRESSED && g_pInputManager->dragMode == MBIND_INVALID) { g_pKeybindManager->m_bIsMouseBindActive = true; g_pInputManager->currentlyDraggedWindow = @@ -2404,7 +2404,8 @@ void CKeybindManager::mouse(std::string args) { } } catch (std::exception& e) { g_pInputManager->dragMode = MBIND_RESIZE; } g_pLayoutManager->getCurrentLayout()->onBeginDragWindow(); - } else { + } else if (!PRESSED && + (g_pInputManager->dragMode == MBIND_RESIZE_FORCE_RATIO || g_pInputManager->dragMode == MBIND_RESIZE_BLOCK_RATIO || g_pInputManager->dragMode == MBIND_RESIZE)) { g_pKeybindManager->m_bIsMouseBindActive = false; if (!g_pInputManager->currentlyDraggedWindow.expired()) { |