From b4ebc18367649613ec69def8a70012d690c34a1d Mon Sep 17 00:00:00 2001 From: vaxerski Date: Wed, 28 Dec 2022 19:52:12 +0100 Subject: [PATCH] remove main_mod --- src/config/ConfigManager.cpp | 5 ----- src/layout/IHyprLayout.cpp | 5 ++--- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp index 88e82791..2ac24f6f 100644 --- a/src/config/ConfigManager.cpp +++ b/src/config/ConfigManager.cpp @@ -35,8 +35,6 @@ void CConfigManager::setDefaultVars() { configValues["general:max_fps"].intValue = 60; configValues["general:sensitivity"].floatValue = 1.0f; configValues["general:apply_sens_to_raw"].intValue = 0; - configValues["general:main_mod"].strValue = "SUPER"; // exposed to the user for easier configuring - configValues["general:main_mod_internal"].intValue = g_pKeybindManager->stringToModMask("SUPER"); // actually used and automatically calculated configValues["general:border_size"].intValue = 1; configValues["general:no_border_on_floating"].intValue = 0; @@ -1242,9 +1240,6 @@ void CConfigManager::loadConfigLoadVars() { g_pInputManager->setTabletConfigs(); } - // Calculate the internal vars - configValues["general:main_mod_internal"].intValue = g_pKeybindManager->stringToModMask(configValues["general:main_mod"].strValue); - if (!isFirstLaunch) g_pHyprOpenGL->m_bReloadScreenShader = true; diff --git a/src/layout/IHyprLayout.cpp b/src/layout/IHyprLayout.cpp index 708fa717..59592958 100644 --- a/src/layout/IHyprLayout.cpp +++ b/src/layout/IHyprLayout.cpp @@ -179,7 +179,6 @@ void IHyprLayout::onBeginDragWindow() { g_pHyprRenderer->damageWindow(DRAGGINGWINDOW); - // shadow to ignore any bound to MAIN_MOD g_pKeybindManager->shadowKeybinds(); } @@ -409,8 +408,8 @@ CWindow* IHyprLayout::getNextWindowCandidate(CWindow* pWindow) { return m_pLastTiledWindow; // if we don't, let's try to find any window that is in the middle - if (const auto PWINDOWCANDIDATE = g_pCompositor->vectorToWindowIdeal(pWindow->m_vRealPosition.goalv() + pWindow->m_vRealSize.goalv() / 2.f); PWINDOWCANDIDATE && - PWINDOWCANDIDATE != pWindow) + if (const auto PWINDOWCANDIDATE = g_pCompositor->vectorToWindowIdeal(pWindow->m_vRealPosition.goalv() + pWindow->m_vRealSize.goalv() / 2.f); + PWINDOWCANDIDATE && PWINDOWCANDIDATE != pWindow) return PWINDOWCANDIDATE; // if not, floating window