diff options
| author | vaxerski <43317083+vaxerski@users.noreply.github.com> | 2022-09-03 22:49:45 +0200 |
|---|---|---|
| committer | vaxerski <43317083+vaxerski@users.noreply.github.com> | 2022-09-03 22:49:52 +0200 |
| commit | fbd2b4799d9c205cb0283432ef9ae3778ff68aa7 (patch) | |
| tree | 0a0218744729b4c63e698144a7f6a17cb9c5cab5 /src/managers | |
| parent | 1664f81cae6bd0e159de835f09d4f0d7105fe07e (diff) | |
Fix some more crimes against humanity
Diffstat (limited to 'src/managers')
| -rw-r--r-- | src/managers/KeybindManager.cpp | 4 | ||||
| -rw-r--r-- | src/managers/input/InputManager.cpp | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp index edb6cfde..e7acc23c 100644 --- a/src/managers/KeybindManager.cpp +++ b/src/managers/KeybindManager.cpp @@ -1207,16 +1207,12 @@ void CKeybindManager::toggleSpecialWorkspace(std::string args) { Debug::log(LOG, "Toggling special workspace to open"); if (open) { - uint64_t monID = -1; - for (auto& m : g_pCompositor->m_vMonitors) { if (m->specialWorkspaceOpen != !open) { m->specialWorkspaceOpen = !open; g_pLayoutManager->getCurrentLayout()->recalculateMonitor(m->ID); g_pCompositor->getWorkspaceByID(SPECIAL_WORKSPACE_ID)->startAnim(false, false); - - monID = m->ID; } } diff --git a/src/managers/input/InputManager.cpp b/src/managers/input/InputManager.cpp index 2e24404d..ada25565 100644 --- a/src/managers/input/InputManager.cpp +++ b/src/managers/input/InputManager.cpp @@ -369,6 +369,7 @@ void CInputManager::processMouseDownNormal(wlr_pointer_button_event* e) { // notify the keybind manager static auto *const PPASSMOUSE = &g_pConfigManager->getConfigValuePtr("binds:pass_mouse_when_bound")->intValue; + static auto *const PMAINMODINTERNAL = &g_pConfigManager->getConfigValuePtr("general:main_mod_internal")->intValue; const auto PASS = g_pKeybindManager->onMouseEvent(e); if (!PASS && !*PPASSMOUSE) @@ -383,7 +384,7 @@ void CInputManager::processMouseDownNormal(wlr_pointer_button_event* e) { if (g_pCompositor->windowValidMapped(g_pCompositor->m_pLastWindow) && g_pCompositor->m_pLastWindow->m_bIsFloating) g_pCompositor->moveWindowToTop(g_pCompositor->m_pLastWindow); - if ((e->button == BTN_LEFT || e->button == BTN_RIGHT) && wlr_keyboard_get_modifiers(PKEYBOARD) == (uint32_t)g_pConfigManager->getInt("general:main_mod_internal")) { + if ((e->button == BTN_LEFT || e->button == BTN_RIGHT) && wlr_keyboard_get_modifiers(PKEYBOARD) == (uint32_t)*PMAINMODINTERNAL) { currentlyDraggedWindow = g_pCompositor->windowFromCursor(); dragButton = e->button; |