diff --git a/include/view.h b/include/view.h index 158234fe..2adf0269 100644 --- a/include/view.h +++ b/include/view.h @@ -169,9 +169,6 @@ void view_reload_ssd(struct view *view); void view_impl_map(struct view *view); void view_adjust_size(struct view *view, int *w, int *h); -bool view_compute_centered_position(struct view *view, int w, int h, - int *x, int *y); - void view_on_output_destroy(struct view *view); void view_destroy(struct view *view); diff --git a/src/view.c b/src/view.c index 2e2a19d8..a42cde25 100644 --- a/src/view.c +++ b/src/view.c @@ -243,7 +243,7 @@ view_output(struct view *view) return output_from_wlr_output(view->server, wlr_output); } -bool +static bool view_compute_centered_position(struct view *view, int w, int h, int *x, int *y) { struct output *output = view_output(view); diff --git a/src/xdg.c b/src/xdg.c index b320e049..8d39a03f 100644 --- a/src/xdg.c +++ b/src/xdg.c @@ -284,20 +284,7 @@ position_xdg_toplevel_view(struct view *view) output_usable_area_from_cursor_coords(view->server); view->current.x = box.x; view->current.y = box.y; - - /* Center the view without touching its w and h fields. This means we - * can't simply set w/h and call view_center(). w and h fields should - * only be modified at commit, or they will not be in sync with the - * scene tree - */ - int w = xdg_surface->current.geometry.width; - int h = xdg_surface->current.geometry.height; - if (w && h) { - int x, y; - if (view_compute_centered_position(view, w, h, &x, &y)) { - view_move(view, x, y); - } - } + view_center(view); } else { /* * If child-toplevel-views, we center-align relative to their