alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #907 from zandrmartin/fix-json-tree-focus-property

Browse source 
fix get_workspaces json reply
This commit is contained in:
Drew DeVault 2016-09-18 12:10:34 +09:00 committed by GitHub
parent 476274cfbb e75217cfb1
commit 043640820f
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sway/ipc-server.c
View file

@ -512,7 +512,13 @@ bool ipc_send_reply(struct ipc_client *client, const char *payload, uint32_t pay
void ipc_get_workspaces_callback(swayc_t *workspace, void *data) { void ipc_get_workspaces_callback(swayc_t *workspace, void *data) {
if (workspace->type == C_WORKSPACE) { if (workspace->type == C_WORKSPACE) {
json_object_array_add((json_object *)data, ipc_json_describe_container(workspace)); json_object *workspace_json = ipc_json_describe_container(workspace);
// override the default focused indicator because
// it's set differently for the get_workspaces reply
bool focused = root_container.focused == workspace->parent && workspace->parent->focused == workspace;
json_object_object_del(workspace_json, "focused");
json_object_object_add(workspace_json, "focused", json_object_new_boolean(focused));
json_object_array_add((json_object *)data, workspace_json);
} }
} }