hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-12-23 09:29:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

config: fix floating rules with floating-by-rule windows

Browse source
This commit is contained in:
vaxerski 2023-07-02 13:02:48 +02:00
parent 86ca283352
commit 738ec900f4
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/config/ConfigManager.cpp
View file

@ -1779,6 +1779,10 @@ std::vector<SWindowRule> CConfigManager::getMatchingRules(CWindow* pWindow) {
Debug::log(LOG, "Searching for matching rules for %s (title: %s)", appidclass.c_str(), title.c_str()); Debug::log(LOG, "Searching for matching rules for %s (title: %s)", appidclass.c_str(), title.c_str());
// since some rules will be applied later, we need to store some flags
bool hasFloating = pWindow->m_bIsFloating;
bool hasFullscreen = pWindow->m_bIsFullscreen;
for (auto& rule : m_dWindowRules) { for (auto& rule : m_dWindowRules) {
// check if we have a matching rule // check if we have a matching rule
if (!rule.v2) { if (!rule.v2) {
@ -1821,12 +1825,12 @@ std::vector<SWindowRule> CConfigManager::getMatchingRules(CWindow* pWindow) {
} }
if (rule.bFloating != -1) { if (rule.bFloating != -1) {
if (pWindow->m_bIsFloating != rule.bFloating) if (hasFloating != rule.bFloating)
continue; continue;
} }
if (rule.bFullscreen != -1) { if (rule.bFullscreen != -1) {
if (pWindow->m_bIsFullscreen != rule.bFullscreen) if (hasFullscreen != rule.bFullscreen)
continue; continue;
} }
@ -1844,6 +1848,11 @@ std::vector<SWindowRule> CConfigManager::getMatchingRules(CWindow* pWindow) {
Debug::log(LOG, "Window rule %s -> %s matched %lx [%s]", rule.szRule.c_str(), rule.szValue.c_str(), pWindow, pWindow->m_szTitle.c_str()); Debug::log(LOG, "Window rule %s -> %s matched %lx [%s]", rule.szRule.c_str(), rule.szValue.c_str(), pWindow, pWindow->m_szTitle.c_str());
returns.push_back(rule); returns.push_back(rule);
if (rule.szRule == "float")
hasFloating = true;
else if (rule.szRule == "fullscreen")
hasFullscreen = true;
} }
std::vector<uint64_t> PIDs = {(uint64_t)pWindow->getPID()}; std::vector<uint64_t> PIDs = {(uint64_t)pWindow->getPID()};