diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-12-06 07:30:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-06 07:30:19 -0500 |
| commit | 8cb4df2a30e26c7d173d740eba36a3cd78a578b1 (patch) | |
| tree | 27d6b9876735658d3d20e2899e050e2b9f21cb07 /rootston/wl_shell.c | |
| parent | e539a8b2081f458ea2d272654b3074390920510e (diff) | |
| parent | 0f3a061f602a1384d7e0778ecd090519e0cb2b30 (diff) | |
Merge pull request #1416 from kragniz/rootston-use-box
rootston: use box for views position
Diffstat (limited to 'rootston/wl_shell.c')
| -rw-r--r-- | rootston/wl_shell.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/rootston/wl_shell.c b/rootston/wl_shell.c index 07ac9f58..0f7228bb 100644 --- a/rootston/wl_shell.c +++ b/rootston/wl_shell.c @@ -162,8 +162,8 @@ static void handle_surface_commit(struct wl_listener *listener, void *data) { int height = wlr_surface->current.height; view_update_size(view, width, height); - double x = view->x; - double y = view->y; + double x = view->box.x; + double y = view->box.y; if (view->pending_move_resize.update_x) { x = view->pending_move_resize.x + view->pending_move_resize.width - width; @@ -236,8 +236,8 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) { return; } view->type = ROOTS_WL_SHELL_VIEW; - view->width = surface->surface->current.width; - view->height = surface->surface->current.height; + view->box.width = surface->surface->current.width; + view->box.height = surface->surface->current.height; view->wl_shell_surface = surface; view->roots_wl_shell_surface = roots_surface; @@ -262,8 +262,8 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) { } if (found) { view_move(view, - parent->x + surface->transient_state->x, - parent->y + surface->transient_state->y); + parent->box.x + surface->transient_state->x, + parent->box.y + surface->transient_state->y); } } } |