cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core: match all workspace rules instead of the first one only (#5340)

Browse source
This commit is contained in:
thejch 2024-03-30 17:49:53 -07:00 • committed by GitHub
parent 1aed45f61d
commit 5e8c25d498
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 91 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/Compositor.cpp
View file

@ -1260,8 +1260,13 @@ void CCompositor::sanityCheckWorkspaces() {
auto it = m_vWorkspaces.begin();
while (it != m_vWorkspaces.end()) {
const auto WORKSPACERULE = g_pConfigManager->getWorkspaceRuleFor(it->get());
if (WORKSPACERULE.isPersistent) {
const auto WORKSPACERULES = g_pConfigManager->getWorkspaceRulesFor(it->get());
bool isPersistent = false;
for (auto& wsRule : WORKSPACERULES) {
if (wsRule.isPersistent)
isPersistent = true;
}
if (isPersistent) {
++it;
continue;
}
@ -1288,8 +1293,10 @@ void CCompositor::sanityCheckWorkspaces() {
continue;
}
if (!WORKSPACE->m_bOnCreatedEmptyExecuted) {
if (auto cmd = WORKSPACERULE.onCreatedEmptyRunCmd)
g_pKeybindManager->spawn(*cmd);
for (auto& wsRule : WORKSPACERULES) {
if (auto cmd = wsRule.onCreatedEmptyRunCmd)
g_pKeybindManager->spawn(*cmd);
}
WORKSPACE->m_bOnCreatedEmptyExecuted = true;
}