view_get_geometry: only out width and height

This is the only thing we need, as we don't use a view's x and y
coordinates for placing windows.
This commit is contained in:
Jente Hidskes 2018-12-31 20:44:20 +01:00
parent 786e28bdac
commit 48f8f69556
No known key found for this signature in database
GPG key ID: 04BE5A29F32D91EA
3 changed files with 11 additions and 7 deletions

8
view.c
View file

@ -43,11 +43,11 @@ view_center(struct cg_view *view)
int output_width, output_height;
wlr_output_effective_resolution(output, &output_width, &output_height);
struct wlr_box geom;
view->get_geometry(view, &geom);
int width, height;
view->get_geometry(view, &width, &height);
view->x = (output_width - geom.width) / 2;
view->y = (output_height - geom.height) / 2;
view->x = (output_width - width) / 2;
view->y = (output_height - height) / 2;
}
bool

2
view.h
View file

@ -32,7 +32,7 @@ struct cg_view {
void (*activate)(struct cg_view *view, bool activate);
void (*maximize)(struct cg_view *view, int output_width, int output_height);
void (*get_geometry)(struct cg_view *view, struct wlr_box *geom);
void (*get_geometry)(struct cg_view *view, int *width_out, int *height_out);
bool (*is_primary)(struct cg_view *view);
};

View file

@ -28,9 +28,13 @@ maximize(struct cg_view *view, int output_width, int output_height)
}
static void
get_geometry(struct cg_view *view, struct wlr_box *geom)
get_geometry(struct cg_view *view, int *width_out, int *height_out)
{
wlr_xdg_surface_get_geometry(view->xdg_surface, geom);
struct wlr_box geom;
wlr_xdg_surface_get_geometry(view->xdg_surface, &geom);
*width_out = geom.width;
*height_out = geom.height;
}
static bool