From 8726a7363eb9213235e6e23657668e0daac39a5b Mon Sep 17 00:00:00 2001 From: Vaxry <43317083+vaxerski@users.noreply.github.com> Date: Fri, 20 Mar 2026 13:52:37 -0400 Subject: config: cleanup the entire config infrastructure (#13785) Massively refactors the config infrastructure, sorely needed and will be req'd for the lua stuff --- src/layout/algorithm/tiled/scrolling/ScrollingAlgorithm.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/layout/algorithm/tiled/scrolling/ScrollingAlgorithm.cpp') diff --git a/src/layout/algorithm/tiled/scrolling/ScrollingAlgorithm.cpp b/src/layout/algorithm/tiled/scrolling/ScrollingAlgorithm.cpp index 8a5b2d59..addd371d 100644 --- a/src/layout/algorithm/tiled/scrolling/ScrollingAlgorithm.cpp +++ b/src/layout/algorithm/tiled/scrolling/ScrollingAlgorithm.cpp @@ -8,12 +8,13 @@ #include "../../../../Compositor.hpp" #include "../../../../desktop/state/FocusState.hpp" #include "../../../../config/ConfigValue.hpp" -#include "../../../../config/ConfigManager.hpp" +#include "../../../../config/shared/workspace/WorkspaceRuleManager.hpp" #include "../../../../render/Renderer.hpp" #include "../../../../managers/input/InputManager.hpp" #include "../../../../event/EventBus.hpp" #include +#include #include #include @@ -1488,10 +1489,10 @@ SP CScrollingAlgorithm::dataFor(SP t) { } eScrollDirection CScrollingAlgorithm::getDynamicDirection() { - const auto WORKSPACERULE = g_pConfigManager->getWorkspaceRuleFor(m_parent->space()->workspace()); + const auto WORKSPACERULE = Config::workspaceRuleMgr()->getWorkspaceRuleFor(m_parent->space()->workspace()); std::string directionString; - if (WORKSPACERULE.layoutopts.contains("direction")) - directionString = WORKSPACERULE.layoutopts.at("direction"); + if (WORKSPACERULE && WORKSPACERULE->m_layoutopts.contains("direction")) + directionString = WORKSPACERULE->m_layoutopts.at("direction"); static const auto PCONFDIRECTION = CConfigValue("scrolling:direction"); std::string configDirection = *PCONFDIRECTION; -- cgit v1.2.3