summaryrefslogtreecommitdiff
path: root/sway/desktop/xwayland.c
diff options
context:
space:
mode:
authorRyan Dwyer <[email protected]>2018-06-06 19:19:30 +1000
committerRyan Dwyer <[email protected]>2018-06-09 10:08:43 +1000
commitf9e6d703d298dbdee0770fd9e0c64ab2d7ac7deb (patch)
tree8c8ffd879e368aff3d749a637aabfa784800db5c /sway/desktop/xwayland.c
parent59c94887018bdfa578c4371c4275061ca6e71b3e (diff)
Make main properties be the pending state
Diffstat (limited to 'sway/desktop/xwayland.c')
-rw-r--r--sway/desktop/xwayland.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index 6a3c1b66..d8442530 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -257,11 +257,9 @@ static void handle_commit(struct wl_listener *listener, void *data) {
if (view->swayc && container_is_floating(view->swayc)) {
view_update_size(view, xsurface->width, xsurface->height);
} else {
- view_update_size(view, view->swayc->pending.swayc_width,
- view->swayc->pending.swayc_height);
+ view_update_size(view, view->swayc->width, view->swayc->height);
}
- view_update_position(view,
- view->swayc->pending.view_x, view->swayc->pending.view_y);
+ view_update_position(view, view->x, view->y);
view_damage_from(view);
}
}
@@ -314,7 +312,8 @@ static void handle_request_configure(struct wl_listener *listener, void *data) {
return;
}
// TODO: Let floating views do whatever
- configure(view, view->swayc->x, view->swayc->y, view->width, view->height);
+ configure(view, view->swayc->current.view_x, view->swayc->current.view_y,
+ view->swayc->current.view_width, view->swayc->current.view_height);
}
static void handle_request_fullscreen(struct wl_listener *listener, void *data) {