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

sway/workspaces: Correct behavior when "current-only" is set 

The `current-only` workspace setting should display only the active
workspace name as determined by its `focused` attribute.  However,
according to the `get_tree` output, workspaces that contain a focused
window will report `"focused": false` and the window will report
`"focused": true.` In this case, Waybar will not display a workspace
name at all.

This change updates the logic for determining if a workspace is
focused by also looking for a focused window.
This commit is contained in:
Peter Jones 2024-06-06 15:24:01 -07:00
parent 365e77af58
commit 637b220f82
No known key found for this signature in database
GPG Key ID: 9DAFAA8D01941E49
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/modules/sway/workspaces.cpp
View File

@ -501,7 +501,16 @@ std::string Workspaces::trimWorkspaceName(std::string name) {
void Workspaces::onButtonReady(const Json::Value &node, Gtk::Button &button) { void Workspaces::onButtonReady(const Json::Value &node, Gtk::Button &button) {
if (config_["current-only"].asBool()) { if (config_["current-only"].asBool()) {
if (node["focused"].asBool()) { // If a workspace has a focused container then get_tree will say
// that the workspace itself isn't focused. Therefore we need to
// check if any of its nodes are focused as well.
bool focused = node["focused"].asBool() ||
std::any_of(node["nodes"].begin(), node["nodes"].end(),
[](const auto &child) {
return child["focused"].asBool();
});
if (focused) {
button.show(); button.show();
} else { } else {
button.hide(); button.hide();