Merge pull request #4315 from notpeelz/style-clang-format
This commit is contained in:
@ -69,14 +69,13 @@ void Workspaces::createWorkspace(Json::Value const &workspace_data,
|
|||||||
spdlog::debug("Creating workspace {}", workspaceName);
|
spdlog::debug("Creating workspace {}", workspaceName);
|
||||||
|
|
||||||
// avoid recreating existing workspaces
|
// avoid recreating existing workspaces
|
||||||
auto workspace =
|
auto workspace = std::ranges::find_if(m_workspaces, [&](std::unique_ptr<Workspace> const &w) {
|
||||||
std::ranges::find_if(m_workspaces, [&](std::unique_ptr<Workspace> const &w) {
|
if (workspaceId > 0) {
|
||||||
if (workspaceId > 0) {
|
return w->id() == workspaceId;
|
||||||
return w->id() == workspaceId;
|
}
|
||||||
}
|
return (workspaceName.starts_with("special:") && workspaceName.substr(8) == w->name()) ||
|
||||||
return (workspaceName.starts_with("special:") && workspaceName.substr(8) == w->name()) ||
|
workspaceName == w->name();
|
||||||
workspaceName == w->name();
|
});
|
||||||
});
|
|
||||||
|
|
||||||
if (workspace != m_workspaces.end()) {
|
if (workspace != m_workspaces.end()) {
|
||||||
// don't recreate workspace, but update persistency if necessary
|
// don't recreate workspace, but update persistency if necessary
|
||||||
@ -295,7 +294,7 @@ void Workspaces::loadPersistentWorkspacesFromWorkspaceRules(const Json::Value &c
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
auto workspace = rule.isMember("defaultName") ? rule["defaultName"].asString()
|
auto workspace = rule.isMember("defaultName") ? rule["defaultName"].asString()
|
||||||
: rule["workspaceString"].asString();
|
: rule["workspaceString"].asString();
|
||||||
|
|
||||||
// The prefix "name:" cause mismatches with workspace names taken anywhere else.
|
// The prefix "name:" cause mismatches with workspace names taken anywhere else.
|
||||||
if (workspace.starts_with("name:")) {
|
if (workspace.starts_with("name:")) {
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
#include <spdlog/spdlog.h>
|
|
||||||
#include "modules/sni/item.hpp"
|
#include "modules/sni/item.hpp"
|
||||||
|
|
||||||
#include <gdkmm/general.h>
|
#include <gdkmm/general.h>
|
||||||
|
Reference in New Issue
Block a user