hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-26 15:45:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

keybinds: add safeguard to mousebinds (#7034)

Browse source 
modified:   src/managers/KeybindManager.cpp
This commit is contained in:
MightyPlaza 2024-07-24 22:19:15 +00:00 committed by GitHub
parent 391f1ae838
commit 4beac91cbd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/managers/KeybindManager.cpp
View file

@ -2366,7 +2366,7 @@ void CKeybindManager::mouse(std::string args) {
const auto PRESSED = args[0] == '1'; const auto PRESSED = args[0] == '1';
if (ARGS[0] == "movewindow") { if (ARGS[0] == "movewindow") {
if (PRESSED) { if (PRESSED && g_pInputManager->dragMode == MBIND_INVALID) {
g_pKeybindManager->m_bIsMouseBindActive = true; g_pKeybindManager->m_bIsMouseBindActive = true;
const auto mouseCoords = g_pInputManager->getMouseCoordsInternal(); const auto mouseCoords = g_pInputManager->getMouseCoordsInternal();
@ -2380,7 +2380,7 @@ void CKeybindManager::mouse(std::string args) {
g_pInputManager->dragMode = MBIND_MOVE; g_pInputManager->dragMode = MBIND_MOVE;
g_pLayoutManager->getCurrentLayout()->onBeginDragWindow(); g_pLayoutManager->getCurrentLayout()->onBeginDragWindow();
} else { } else if (!PRESSED && g_pInputManager->dragMode == MBIND_MOVE) {
g_pKeybindManager->m_bIsMouseBindActive = false; g_pKeybindManager->m_bIsMouseBindActive = false;
if (!g_pInputManager->currentlyDraggedWindow.expired()) { if (!g_pInputManager->currentlyDraggedWindow.expired()) {
@ -2390,7 +2390,7 @@ void CKeybindManager::mouse(std::string args) {
} }
} }
} else if (ARGS[0] == "resizewindow") { } else if (ARGS[0] == "resizewindow") {
if (PRESSED) { if (PRESSED && g_pInputManager->dragMode == MBIND_INVALID) {
g_pKeybindManager->m_bIsMouseBindActive = true; g_pKeybindManager->m_bIsMouseBindActive = true;
g_pInputManager->currentlyDraggedWindow = g_pInputManager->currentlyDraggedWindow =
@ -2404,7 +2404,8 @@ void CKeybindManager::mouse(std::string args) {
} }
} catch (std::exception& e) { g_pInputManager->dragMode = MBIND_RESIZE; } } catch (std::exception& e) { g_pInputManager->dragMode = MBIND_RESIZE; }
g_pLayoutManager->getCurrentLayout()->onBeginDragWindow(); 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; g_pKeybindManager->m_bIsMouseBindActive = false;
if (!g_pInputManager->currentlyDraggedWindow.expired()) { if (!g_pInputManager->currentlyDraggedWindow.expired()) {