summaryrefslogtreecommitdiffstats
path: root/sway/desktop/output.c
diff options
context:
space:
mode:
Diffstat (limited to 'sway/desktop/output.c')
-rw-r--r--sway/desktop/output.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index c53a9c73..e8112bd9 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -160,12 +160,12 @@ void output_view_for_each_surface(struct sway_output *output,
160 .user_iterator = iterator, 160 .user_iterator = iterator,
161 .user_data = user_data, 161 .user_data = user_data,
162 .output = output, 162 .output = output,
163 .ox = view->container->current.view_x - output->wlr_output->lx 163 .ox = view->container->current.content_x - output->wlr_output->lx
164 - view->geometry.x, 164 - view->geometry.x,
165 .oy = view->container->current.view_y - output->wlr_output->ly 165 .oy = view->container->current.content_y - output->wlr_output->ly
166 - view->geometry.y, 166 - view->geometry.y,
167 .width = view->container->current.view_width, 167 .width = view->container->current.content_width,
168 .height = view->container->current.view_height, 168 .height = view->container->current.content_height,
169 .rotation = 0, // TODO 169 .rotation = 0, // TODO
170 }; 170 };
171 171
@@ -179,12 +179,12 @@ void output_view_for_each_popup(struct sway_output *output,
179 .user_iterator = iterator, 179 .user_iterator = iterator,
180 .user_data = user_data, 180 .user_data = user_data,
181 .output = output, 181 .output = output,
182 .ox = view->container->current.view_x - output->wlr_output->lx 182 .ox = view->container->current.content_x - output->wlr_output->lx
183 - view->geometry.x, 183 - view->geometry.x,
184 .oy = view->container->current.view_y - output->wlr_output->ly 184 .oy = view->container->current.content_y - output->wlr_output->ly
185 - view->geometry.y, 185 - view->geometry.y,
186 .width = view->container->current.view_width, 186 .width = view->container->current.content_width,
187 .height = view->container->current.view_height, 187 .height = view->container->current.content_height,
188 .rotation = 0, // TODO 188 .rotation = 0, // TODO
189 }; 189 };
190 190
@@ -473,10 +473,10 @@ void output_damage_whole_container(struct sway_output *output,
473 struct sway_container *con) { 473 struct sway_container *con) {
474 // Pad the box by 1px, because the width is a double and might be a fraction 474 // Pad the box by 1px, because the width is a double and might be a fraction
475 struct wlr_box box = { 475 struct wlr_box box = {
476 .x = con->current.con_x - output->wlr_output->lx - 1, 476 .x = con->current.x - output->wlr_output->lx - 1,
477 .y = con->current.con_y - output->wlr_output->ly - 1, 477 .y = con->current.y - output->wlr_output->ly - 1,
478 .width = con->current.con_width + 2, 478 .width = con->current.width + 2,
479 .height = con->current.con_height + 2, 479 .height = con->current.height + 2,
480 }; 480 };
481 scale_box(&box, output->wlr_output->scale); 481 scale_box(&box, output->wlr_output->scale);
482 wlr_output_damage_add_box(output->damage, &box); 482 wlr_output_damage_add_box(output->damage, &box);