RPJosh
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2373 from marshallmoats/master

pull/2377/head
Alexis Rouillard 2023-08-02 08:35:10 +02:00 committed by GitHub
parent 86b3e456e1 ce2ede70f2
commit 7fb37c0069
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/hyprland/workspaces.cpp
View File

@ -100,7 +100,7 @@ void Workspaces::onEvent(const std::string &ev) {
for (Json::Value workspace_json : workspaces_json) { for (Json::Value workspace_json : workspaces_json) {
if (workspace_json["name"].asString() == payload && if (workspace_json["name"].asString() == payload &&
(all_outputs() || bar_.output->name == workspace_json["monitor"].asString()) && (all_outputs() || bar_.output->name == workspace_json["monitor"].asString()) &&
(show_special() || workspace_json["name"].asString().starts_with("special"))) { (show_special() || !workspace_json["name"].asString().starts_with("special"))) {
workspaces_to_create_.push_back(workspace_json); workspaces_to_create_.push_back(workspace_json);
break; break;
} }
@ -266,7 +266,7 @@ void Workspaces::init() {
const Json::Value workspaces_json = gIPC->getSocket1JsonReply("workspaces"); const Json::Value workspaces_json = gIPC->getSocket1JsonReply("workspaces");
for (Json::Value workspace_json : workspaces_json) { for (Json::Value workspace_json : workspaces_json) {
if ((all_outputs() || bar_.output->name == workspace_json["monitor"].asString()) && if ((all_outputs() || bar_.output->name == workspace_json["monitor"].asString()) &&
(workspace_json["name"].asString().starts_with("special") || show_special())) (!workspace_json["name"].asString().starts_with("special") || show_special()))
create_workspace(workspace_json); create_workspace(workspace_json);
} }
@ -325,7 +325,8 @@ void Workspace::update(const std::string &format, const std::string &icon) {
add_or_remove_class(style_context, is_empty(), "persistent"); add_or_remove_class(style_context, is_empty(), "persistent");
label_.set_markup( label_.set_markup(
fmt::format(fmt::runtime(format), fmt::arg("name", name()), fmt::arg("icon", icon))); fmt::format(fmt::runtime(format), fmt::arg("id", id()),
fmt::arg("name", name()), fmt::arg("icon", icon)));
} }
void Workspaces::sort_workspaces() { void Workspaces::sort_workspaces() {