diff options
| author | emersion <contact@emersion.fr> | 2018-06-01 14:29:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-01 14:29:05 +0100 |
| commit | 84c09152aff771d3de899594b6590ce2db173025 (patch) | |
| tree | 3a090551a15d3052ce59ba35b3f1a762a4b632d1 /rootston/xdg_shell_v6.c | |
| parent | 6b7a55aa3d548e29917027e68181412897a01b1a (diff) | |
| parent | 3994762ae05d18f2ec0fe9509e4dd41224cde56e (diff) | |
Merge pull request #1021 from Ongy/xdg_geometry
Add wlr_surface_get_geometry
Diffstat (limited to 'rootston/xdg_shell_v6.c')
| -rw-r--r-- | rootston/xdg_shell_v6.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/rootston/xdg_shell_v6.c b/rootston/xdg_shell_v6.c index 90b11690..02ad867d 100644 --- a/rootston/xdg_shell_v6.c +++ b/rootston/xdg_shell_v6.c @@ -133,14 +133,10 @@ static void get_size(const struct roots_view *view, struct wlr_box *box) { assert(view->type == ROOTS_XDG_SHELL_V6_VIEW); struct wlr_xdg_surface_v6 *surface = view->xdg_surface_v6; - if (surface->geometry.width > 0 && surface->geometry.height > 0) { - box->width = surface->geometry.width; - box->height = surface->geometry.height; - } else { - assert(surface->surface); - box->width = surface->surface->current->width; - box->height = surface->surface->current->height; - } + struct wlr_box geo_box; + wlr_xdg_surface_v6_get_geometry(surface, &geo_box); + box->width = geo_box.width; + box->height = geo_box.height; } static void activate(struct roots_view *view, bool active) { |