Merge pull request #3037 from grimpy/fixperistentclass

Fix peristent class on buttons
pull/3034/head
Alexis Rouillard 2024-03-19 22:56:37 +01:00 committed by GitHub
commit cbe42a8536
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions

View File

@ -156,7 +156,7 @@ void Workspaces::onCmd(const struct Ipc::ipc_response &res) {
if (output.asString() == bar_.output->name) { if (output.asString() == bar_.output->name) {
Json::Value v; Json::Value v;
v["name"] = p_w_name; v["name"] = p_w_name;
v["output"] = bar_.output->name; v["target_output"] = bar_.output->name;
v["num"] = convertWorkspaceNameToNum(p_w_name); v["num"] = convertWorkspaceNameToNum(p_w_name);
workspaces_.emplace_back(std::move(v)); workspaces_.emplace_back(std::move(v));
break; break;
@ -166,7 +166,7 @@ void Workspaces::onCmd(const struct Ipc::ipc_response &res) {
// Adding to all outputs // Adding to all outputs
Json::Value v; Json::Value v;
v["name"] = p_w_name; v["name"] = p_w_name;
v["output"] = ""; v["target_output"] = "";
v["num"] = convertWorkspaceNameToNum(p_w_name); v["num"] = convertWorkspaceNameToNum(p_w_name);
workspaces_.emplace_back(std::move(v)); workspaces_.emplace_back(std::move(v));
} }
@ -317,7 +317,7 @@ auto Workspaces::update() -> void {
} else { } else {
button.get_style_context()->remove_class("urgent"); button.get_style_context()->remove_class("urgent");
} }
if (hasFlag((*it), "target_output")) { if ((*it)["target_output"].isString()) {
button.get_style_context()->add_class("persistent"); button.get_style_context()->add_class("persistent");
} else { } else {
button.get_style_context()->remove_class("persistent"); button.get_style_context()->remove_class("persistent");