From f663fa209ce72571bd4c551a19757ccd58b3fb7f Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Fri, 9 Sep 2022 19:08:04 +0200 Subject: [PATCH] minor code styling fixes --- src/helpers/Color.cpp | 4 +--- src/managers/input/InputManager.cpp | 1 - src/managers/input/InputMethodRelay.cpp | 4 +--- src/managers/input/Swipe.cpp | 2 -- src/managers/input/Touch.cpp | 2 -- 5 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/helpers/Color.cpp b/src/helpers/Color.cpp index 6b73b4d7..37ea39c8 100644 --- a/src/helpers/Color.cpp +++ b/src/helpers/Color.cpp @@ -1,9 +1,7 @@ #include "Color.hpp" #include "../defines.hpp" -CColor::CColor() { - -} +CColor::CColor() { } CColor::CColor(float r, float g, float b, float a) { this->r = r; diff --git a/src/managers/input/InputManager.cpp b/src/managers/input/InputManager.cpp index e3d9ab1d..7e4bfadd 100644 --- a/src/managers/input/InputManager.cpp +++ b/src/managers/input/InputManager.cpp @@ -29,7 +29,6 @@ void CInputManager::onMouseWarp(wlr_pointer_motion_absolute_event* e) { } void CInputManager::mouseMoveUnified(uint32_t time, bool refocus) { - static auto *const PFOLLOWMOUSE = &g_pConfigManager->getConfigValuePtr("input:follow_mouse")->intValue; static auto *const PMOUSEDPMS = &g_pConfigManager->getConfigValuePtr("misc:mouse_move_enables_dpms")->intValue; static auto *const PFOLLOWONDND = &g_pConfigManager->getConfigValuePtr("misc:always_follow_on_dnd")->intValue; diff --git a/src/managers/input/InputMethodRelay.cpp b/src/managers/input/InputMethodRelay.cpp index e697c44f..f9582f54 100644 --- a/src/managers/input/InputMethodRelay.cpp +++ b/src/managers/input/InputMethodRelay.cpp @@ -2,9 +2,7 @@ #include "InputManager.hpp" #include "../../Compositor.hpp" -CInputMethodRelay::CInputMethodRelay() { - -} +CInputMethodRelay::CInputMethodRelay() { } void CInputMethodRelay::onNewIME(wlr_input_method_v2* pIME) { if (m_pWLRIME) { diff --git a/src/managers/input/Swipe.cpp b/src/managers/input/Swipe.cpp index 4468cac8..fe78145d 100644 --- a/src/managers/input/Swipe.cpp +++ b/src/managers/input/Swipe.cpp @@ -2,7 +2,6 @@ #include "../../Compositor.hpp" void CInputManager::onSwipeBegin(wlr_pointer_swipe_begin_event* e) { - static auto *const PSWIPE = &g_pConfigManager->getConfigValuePtr("gestures:workspace_swipe")->intValue; static auto *const PSWIPEFINGERS = &g_pConfigManager->getConfigValuePtr("gestures:workspace_swipe_fingers")->intValue; @@ -31,7 +30,6 @@ void CInputManager::onSwipeBegin(wlr_pointer_swipe_begin_event* e) { } void CInputManager::onSwipeEnd(wlr_pointer_swipe_end_event* e) { - if (!m_sActiveSwipe.pWorkspaceBegin) return; // no valid swipe diff --git a/src/managers/input/Touch.cpp b/src/managers/input/Touch.cpp index daf34200..5d97369f 100644 --- a/src/managers/input/Touch.cpp +++ b/src/managers/input/Touch.cpp @@ -2,7 +2,6 @@ #include "../../Compositor.hpp" void CInputManager::onTouchDown(wlr_touch_down_event* e) { - wlr_cursor_warp(g_pCompositor->m_sWLRCursor, g_pCompositor->m_sSeat.mouse->mouse, g_pCompositor->m_pLastMonitor->vecPosition.x + e->x * g_pCompositor->m_pLastMonitor->vecSize.x, g_pCompositor->m_pLastMonitor->vecPosition.y + e->y * g_pCompositor->m_pLastMonitor->vecSize.y); refocus(); @@ -26,7 +25,6 @@ void CInputManager::onTouchDown(wlr_touch_down_event* e) { } void CInputManager::onTouchUp(wlr_touch_up_event* e){ - if (m_sTouchData.touchFocusWindow) { wlr_seat_touch_notify_up(g_pCompositor->m_sSeat.seat, e->time_msec, e->touch_id); }