diff options
| author | Vaxry <43317083+vaxerski@users.noreply.github.com> | 2024-04-27 12:43:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-27 12:43:12 +0100 |
| commit | bca7804bb6e1bf5ce5a99b9ae4806be25e36993c (patch) | |
| tree | ebd3a578de1dfe11b54f9440cfc3a408ffa6a620 /src/config | |
| parent | 25aec3ac8ce65ed224f025f8f6dfef73780577a4 (diff) | |
internal: Window storage rework - part 1 (#5762)
* Window storage rework - part 1
* format
* remove useless include
* fix pch
* format
* fix crash in dwindle
* fix vram leak
* prefer .expired() for bool checks
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/ConfigManager.cpp | 6 | ||||
| -rw-r--r-- | src/config/ConfigManager.hpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp index 587d8c82..3c1bc80d 100644 --- a/src/config/ConfigManager.cpp +++ b/src/config/ConfigManager.cpp @@ -1018,8 +1018,8 @@ SWorkspaceRule CConfigManager::mergeWorkspaceRules(const SWorkspaceRule& rule1, return mergedRule; } -std::vector<SWindowRule> CConfigManager::getMatchingRules(CWindow* pWindow, bool dynamic, bool shadowExec) { - if (!g_pCompositor->windowExists(pWindow)) +std::vector<SWindowRule> CConfigManager::getMatchingRules(PHLWINDOW pWindow, bool dynamic, bool shadowExec) { + if (!valid(pWindow)) return std::vector<SWindowRule>(); std::vector<SWindowRule> returns; @@ -1104,7 +1104,7 @@ std::vector<SWindowRule> CConfigManager::getMatchingRules(CWindow* pWindow, bool } if (rule.bFocus != -1) { - if (rule.bFocus != (g_pCompositor->m_pLastWindow == pWindow)) + if (rule.bFocus != (g_pCompositor->m_pLastWindow.lock() == pWindow)) continue; } diff --git a/src/config/ConfigManager.hpp b/src/config/ConfigManager.hpp index bdfd14d0..aa34cf3b 100644 --- a/src/config/ConfigManager.hpp +++ b/src/config/ConfigManager.hpp @@ -113,7 +113,7 @@ class CConfigManager { std::string getBoundMonitorStringForWS(const std::string&); const std::deque<SWorkspaceRule>& getAllWorkspaceRules(); - std::vector<SWindowRule> getMatchingRules(CWindow*, bool dynamic = true, bool shadowExec = false); + std::vector<SWindowRule> getMatchingRules(PHLWINDOW, bool dynamic = true, bool shadowExec = false); std::vector<SLayerRule> getMatchingRules(SLayerSurface*); std::unordered_map<std::string, SMonitorAdditionalReservedArea> m_mAdditionalReservedAreas; |