mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-18 06:59:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add tree representation to IPC workspace description

Browse source
This commit is contained in:
Ryan Dwyer 2018-05-29 17:42:11 +10:00
parent 3482eebaca
commit 6f4cb2b29d
3 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sway/ipc-json.c
View file

@ -147,6 +147,8 @@ static void ipc_json_describe_workspace(struct sway_container *workspace,
json_object_new_string(workspace->parent->name) : NULL);
json_object_object_add(object, "type", json_object_new_string("workspace"));
json_object_object_add(object, "urgent", json_object_new_boolean(false));
json_object_object_add(object, "representation", workspace->formatted_title ?
json_object_new_string(workspace->formatted_title) : NULL);
const char *layout = ipc_json_layout_description(workspace->layout);
json_object_object_add(object, "layout", json_object_new_string(layout));

10
sway/tree/container.c
View file

@ -842,7 +842,7 @@ static size_t get_tree_representation(struct sway_container *parent, char *buffe
}
void container_notify_subtree_changed(struct sway_container *container) {
if (!container || container->type != C_CONTAINER) {
if (!container || container->type < C_WORKSPACE) {
return;
}
free(container->formatted_title);
@ -856,9 +856,11 @@ void container_notify_subtree_changed(struct sway_container *container) {
get_tree_representation(container, buffer);
container->formatted_title = buffer;
container_calculate_title_height(container);
container_update_title_textures(container);
container_notify_subtree_changed(container->parent);
if (container->type != C_WORKSPACE) {
container_calculate_title_height(container);
container_update_title_textures(container);
container_notify_subtree_changed(container->parent);
}
}
size_t container_titlebar_height() {