From b0bbf03c60697f0256872ab7e871341aa21bb5bc Mon Sep 17 00:00:00 2001 From: erstarr <253168930+erstarr@users.noreply.github.com> Date: Wed, 29 Apr 2026 23:30:25 +0200 Subject: [PATCH] Drop `hyprctl keyword` change --- src/config/legacy/ConfigManager.cpp | 2 +- src/layout/LayoutManager.hpp | 1 - src/layout/space/Space.cpp | 3 +-- src/layout/space/Space.hpp | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/config/legacy/ConfigManager.cpp b/src/config/legacy/ConfigManager.cpp index f97fde7e9..2705c3959 100644 --- a/src/config/legacy/ConfigManager.cpp +++ b/src/config/legacy/ConfigManager.cpp @@ -1096,7 +1096,7 @@ std::string CConfigManager::parseKeyword(const std::string& COMMAND, const std:: // invalidate layouts if they changed if (COMMAND == "monitor" || COMMAND.contains("gaps_") || COMMAND.starts_with("dwindle:") || COMMAND.starts_with("master:")) { for (auto const& m : g_pCompositor->m_monitors) { - g_layoutManager->recalculateMonitor(m, Layout::CLayoutManager::RECALCULATE_MONITOR_REASON_HYPRCTL_KEYWORD); + g_layoutManager->recalculateMonitor(m); } } diff --git a/src/layout/LayoutManager.hpp b/src/layout/LayoutManager.hpp index 3bb44437b..c78ad30e6 100644 --- a/src/layout/LayoutManager.hpp +++ b/src/layout/LayoutManager.hpp @@ -49,7 +49,6 @@ namespace Layout { RECALCULATE_MONITOR_REASON_UNKNOWN, // when the recalculate monitor reason is unknown or not important to preserve RECALCULATE_MONITOR_REASON_WORKSPACE_CHANGE, RECALCULATE_MONITOR_REASON_TOGGLE_SPECIAL_WORKSPACE, - RECALCULATE_MONITOR_REASON_HYPRCTL_KEYWORD, RECALCULATE_MONITOR_REASON_TOGGLE_FULLSCREEN, }; diff --git a/src/layout/space/Space.cpp b/src/layout/space/Space.cpp index f3ae50895..827f39a72 100644 --- a/src/layout/space/Space.cpp +++ b/src/layout/space/Space.cpp @@ -203,7 +203,7 @@ SP CSpace::getNextCandidate(SP old) { } bool Layout::isHardRecalculateReason(eRecalculateReason reason) { - return reason != RECALCULATE_REASON_WORKSPACE_CHANGE && reason != RECALCULATE_REASON_SPECIAL_WORKSPACE_TOGGLE && reason != RECALCULATE_REASON_HYPRCTL_KEYWORD && + return reason != RECALCULATE_REASON_WORKSPACE_CHANGE && reason != RECALCULATE_REASON_SPECIAL_WORKSPACE_TOGGLE && reason != RECALCULATE_REASON_TOGGLE_FULLSCREEN && reason != RECALCULATE_REASON_INVALIDATE_MONITOR_GEOMETRIES && reason != RECALCULATE_REASON_RENDER_MOINTOR; } @@ -216,7 +216,6 @@ eRecalculateReason Layout::recalcMonitorReasonToRecalcReason(CLayoutManager::eRe switch (reason) { case CLayoutManager::RECALCULATE_MONITOR_REASON_TOGGLE_SPECIAL_WORKSPACE: return RECALCULATE_REASON_SPECIAL_WORKSPACE_TOGGLE; case CLayoutManager::RECALCULATE_MONITOR_REASON_WORKSPACE_CHANGE: return RECALCULATE_REASON_WORKSPACE_CHANGE; - case CLayoutManager::RECALCULATE_MONITOR_REASON_HYPRCTL_KEYWORD: return RECALCULATE_REASON_HYPRCTL_KEYWORD; case CLayoutManager::RECALCULATE_MONITOR_REASON_TOGGLE_FULLSCREEN: return RECALCULATE_REASON_TOGGLE_FULLSCREEN; default: return RECALCULATE_REASON_UNKNOWN; } diff --git a/src/layout/space/Space.hpp b/src/layout/space/Space.hpp index 7300e5b89..6f7236966 100644 --- a/src/layout/space/Space.hpp +++ b/src/layout/space/Space.hpp @@ -17,7 +17,6 @@ namespace Layout { RECALCULATE_REASON_UNKNOWN, // when the recalculate reason is unknown or not important to preserve RECALCULATE_REASON_WORKSPACE_CHANGE, RECALCULATE_REASON_SPECIAL_WORKSPACE_TOGGLE, - RECALCULATE_REASON_HYPRCTL_KEYWORD, RECALCULATE_REASON_TOGGLE_FULLSCREEN, RECALCULATE_REASON_INVALIDATE_MONITOR_GEOMETRIES, RECALCULATE_REASON_RENDER_MOINTOR,