diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-04-06 16:13:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-06 16:13:26 -0400 |
| commit | 640232eb225058a18f20190235f679caf678e1f7 (patch) | |
| tree | 4323a9130346ca4d836b0ae70c03877e13310bfc /sway/desktop | |
| parent | 656ef558a2a8d55cf77cbcc8ce01c861cb78ac97 (diff) | |
Revert "Break everything^W^WUse wlr_box for sway_container"
Diffstat (limited to 'sway/desktop')
| -rw-r--r-- | sway/desktop/desktop.c | 2 | ||||
| -rw-r--r-- | sway/desktop/output.c | 15 |
2 files changed, 6 insertions, 11 deletions
diff --git a/sway/desktop/desktop.c b/sway/desktop/desktop.c index f0a14445..3a13191f 100644 --- a/sway/desktop/desktop.c +++ b/sway/desktop/desktop.c @@ -8,7 +8,7 @@ void desktop_damage_whole_surface(struct wlr_surface *surface, double lx, struct sway_container *cont = root_container.children->items[i]; if (cont->type == C_OUTPUT) { output_damage_whole_surface(cont->sway_output, - lx - cont->box.x, ly - cont->box.y, surface); + lx - cont->x, ly - cont->y, surface); } } } diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 49ffe74c..aa18f1b8 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -192,22 +192,17 @@ static void render_view(struct sway_container *view, void *data) { int window_offset_x = view->sway_view->wlr_xdg_surface_v6->geometry.x; int window_offset_y = view->sway_view->wlr_xdg_surface_v6->geometry.y; render_surface(surface, wlr_output, when, - view->box.x - window_offset_x, - view->box.y - window_offset_y, - 0, alpha); - render_xdg_v6_popups(sway_view->wlr_xdg_surface_v6, wlr_output, when, - view->box.x - window_offset_x, - view->box.y - window_offset_y, - 0, alpha); + view->x - window_offset_x, view->y - window_offset_y, 0, alpha); + render_xdg_v6_popups(sway_view->wlr_xdg_surface_v6, wlr_output, + when, view->x - window_offset_x, view->y - window_offset_y, 0, alpha); break; } case SWAY_VIEW_WL_SHELL: render_wl_shell_surface(sway_view->wlr_wl_shell_surface, wlr_output, - when, view->box.x, view->box.y, 0, alpha, false); + when, view->x, view->y, 0, alpha, false); break; case SWAY_VIEW_XWAYLAND: - render_surface(surface, wlr_output, when, - view->box.x, view->box.y, 0, alpha); + render_surface(surface, wlr_output, when, view->x, view->y, 0, alpha); break; } } |