From d6e165ec05b780a5760ffd421055edf548c87203 Mon Sep 17 00:00:00 2001 From: Ching Pei Yang Date: Wed, 11 Jan 2023 06:08:27 +0100 Subject: [PATCH] rename config option to "resize_on_borders" --- src/Compositor.cpp | 2 +- src/config/ConfigManager.cpp | 2 +- src/managers/input/InputManager.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Compositor.cpp b/src/Compositor.cpp index 62c2feac..0e461d8d 100644 --- a/src/Compositor.cpp +++ b/src/Compositor.cpp @@ -561,7 +561,7 @@ void findExtensionForVector2D(wlr_surface* surface, int x, int y, void* data) { CWindow* CCompositor::vectorToWindowIdeal(const Vector2D& pos) { const auto PMONITOR = getMonitorFromVector(pos); - const auto FOCUS_EXTENT = g_pConfigManager->getConfigValuePtr("general:resize_on_gaps")->intValue ? g_pConfigManager->getConfigValuePtr("general:border_size")->intValue : 0; + const auto FOCUS_EXTENT = g_pConfigManager->getConfigValuePtr("general:resize_on_borders")->intValue ? g_pConfigManager->getConfigValuePtr("general:border_size")->intValue : 0; // special workspace if (PMONITOR->specialWorkspaceID) { diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp index c8e552cf..3a11c311 100644 --- a/src/config/ConfigManager.cpp +++ b/src/config/ConfigManager.cpp @@ -46,7 +46,7 @@ void CConfigManager::setDefaultVars() { ((CGradientValueData*)configValues["general:col.inactive_border"].data.get())->reset(0xff444444); configValues["general:cursor_inactive_timeout"].intValue = 0; configValues["general:no_cursor_warps"].intValue = 0; - configValues["general:resize_on_gaps"].intValue = 0; + configValues["general:resize_on_borders"].intValue = 0; configValues["general:layout"].strValue = "dwindle"; diff --git a/src/managers/input/InputManager.cpp b/src/managers/input/InputManager.cpp index 88ed9a94..9bb797e1 100644 --- a/src/managers/input/InputManager.cpp +++ b/src/managers/input/InputManager.cpp @@ -39,7 +39,7 @@ void CInputManager::mouseMoveUnified(uint32_t time, bool refocus) { static auto* const PFOLLOWONDND = &g_pConfigManager->getConfigValuePtr("misc:always_follow_on_dnd")->intValue; static auto* const PHOGFOCUS = &g_pConfigManager->getConfigValuePtr("misc:layers_hog_keyboard_focus")->intValue; static auto* const PFLOATBEHAVIOR = &g_pConfigManager->getConfigValuePtr("input:float_switch_override_focus")->intValue; - const auto FOCUS_EXTENT = g_pConfigManager->getConfigValuePtr("general:resize_on_gaps")->intValue ? g_pConfigManager->getConfigValuePtr("general:border_size")->intValue : 0; + const auto FOCUS_EXTENT = g_pConfigManager->getConfigValuePtr("general:resize_on_borders")->intValue ? g_pConfigManager->getConfigValuePtr("general:border_size")->intValue : 0; m_pFoundSurfaceToFocus = nullptr; m_pFoundLSToFocus = nullptr; @@ -389,7 +389,7 @@ void CInputManager::processMouseDownNormal(wlr_pointer_button_event* e) { static auto* const PPASSMOUSE = &g_pConfigManager->getConfigValuePtr("binds:pass_mouse_when_bound")->intValue; const auto PASS = g_pKeybindManager->onMouseEvent(e); static auto* const PFOLLOWMOUSE = &g_pConfigManager->getConfigValuePtr("input:follow_mouse")->intValue; - static auto* const PGAPRESIZE = &g_pConfigManager->getConfigValuePtr("general:resize_on_gaps")->intValue; + static auto* const PGAPRESIZE = &g_pConfigManager->getConfigValuePtr("general:resize_on_borders")->intValue; if (!PASS && !*PPASSMOUSE) return;