summaryrefslogtreecommitdiffstats
path: root/sway
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <bosrsf04@gmail.com>2018-07-30 01:59:20 -0400
committerLibravatar Brian Ashworth <bosrsf04@gmail.com>2018-07-30 01:59:20 -0400
commitb8efdeae298d59bf7015a9821e3d29cc4e9852e1 (patch)
treef1758d634c85ac5772e26d91078e892e596a6c40 /sway
parentEnable unstable wlroots features (diff)
downloadsway-b8efdeae298d59bf7015a9821e3d29cc4e9852e1.tar.gz
sway-b8efdeae298d59bf7015a9821e3d29cc4e9852e1.tar.zst
sway-b8efdeae298d59bf7015a9821e3d29cc4e9852e1.zip
Fix title textures on scale change
Diffstat (limited to 'sway')
-rw-r--r--sway/desktop/output.c6
-rw-r--r--sway/tree/container.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index cecd300a..fb52e7b1 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -506,14 +506,10 @@ static void handle_transform(struct wl_listener *listener, void *data) {
506 transaction_commit_dirty(); 506 transaction_commit_dirty();
507} 507}
508 508
509static void handle_scale_iterator(struct sway_container *view, void *data) {
510 view_update_marks_textures(view->sway_view);
511}
512
513static void handle_scale(struct wl_listener *listener, void *data) { 509static void handle_scale(struct wl_listener *listener, void *data) {
514 struct sway_output *output = wl_container_of(listener, output, scale); 510 struct sway_output *output = wl_container_of(listener, output, scale);
515 arrange_layers(output); 511 arrange_layers(output);
516 container_descendants(output->swayc, C_VIEW, handle_scale_iterator, NULL); 512 container_update_textures_recursive(output->swayc);
517 arrange_windows(output->swayc); 513 arrange_windows(output->swayc);
518 transaction_commit_dirty(); 514 transaction_commit_dirty();
519} 515}
diff --git a/sway/tree/container.c b/sway/tree/container.c
index b7442002..4e85021d 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -67,7 +67,7 @@ void container_create_notify(struct sway_container *container) {
67 } 67 }
68} 68}
69 69
70static void container_update_textures_recursive(struct sway_container *con) { 70void container_update_textures_recursive(struct sway_container *con) {
71 if (con->type == C_CONTAINER || con->type == C_VIEW) { 71 if (con->type == C_CONTAINER || con->type == C_VIEW) {
72 container_update_title_textures(con); 72 container_update_title_textures(con);
73 } 73 }
@@ -79,6 +79,10 @@ static void container_update_textures_recursive(struct sway_container *con) {
79 struct sway_container *child = con->children->items[i]; 79 struct sway_container *child = con->children->items[i];
80 container_update_textures_recursive(child); 80 container_update_textures_recursive(child);
81 } 81 }
82
83 if (con->type == C_WORKSPACE) {
84 container_update_textures_recursive(con->sway_workspace->floating);
85 }
82 } 86 }
83} 87}
84 88