monitor desc default workspace (#2673)

This commit is contained in:
MightyPlaza 2023-07-10 05:53:03 +00:00 committed by GitHub
parent d9f7f039e1
commit 4cc0e6de90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2183,8 +2183,10 @@ void CConfigManager::removePluginConfig(HANDLE handle) {
} }
std::string CConfigManager::getDefaultWorkspaceFor(const std::string& name) { std::string CConfigManager::getDefaultWorkspaceFor(const std::string& name) {
const auto IT = std::find_if(m_dWorkspaceRules.begin(), m_dWorkspaceRules.end(), [&](const auto& other) { return other.monitor == name && other.isDefault; }); for (auto other = m_dWorkspaceRules.begin(); other != m_dWorkspaceRules.end(); ++other) {
if (IT == m_dWorkspaceRules.end()) if (other->isDefault &&
return ""; (other->monitor == name || (other->monitor.substr(0, 5) == "desc:" && g_pCompositor->getMonitorFromDesc(other->monitor.substr(5))->szName == name)))
return IT->workspaceString; return other->workspaceString;
}
return "";
} }