mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-03 09:01:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

view: Add optional output parameter to view_center()

Browse source 
Allows centering the view on a specific output without the workaround of
overwriting view->current.x/y.
This commit is contained in:
John Lindgren 2023-02-18 00:23:19 -05:00
parent df7c47b8d7
commit 5062c5bea3
6 changed files with 22 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/output.c
View file

@ -518,14 +518,13 @@ output_usable_area_in_layout_coords(struct output *output)
return box;
}
struct wlr_box
output_usable_area_from_cursor_coords(struct server *server)
struct output *
output_from_cursor_coords(struct server *server)
{
struct wlr_output *wlr_output;
wlr_output = wlr_output_layout_output_at(server->output_layout,
server->seat.cursor->x, server->seat.cursor->y);
struct output *output = output_from_wlr_output(server, wlr_output);
return output_usable_area_in_layout_coords(output);
return output_from_wlr_output(server, wlr_output);
}
void

27
src/view.c
View file

@ -238,19 +238,18 @@ view_output(struct view *view)
}
static bool
view_compute_centered_position(struct view *view, int w, int h, int *x, int *y)
view_compute_centered_position(struct view *view, struct output *output,
int w, int h, int *x, int *y)
{
if (w <= 0 || h <= 0) {
wlr_log(WLR_ERROR, "view has empty geometry, not centering");
return false;
}
struct output *output = view_output(view);
if (!output) {
return false;
}
struct wlr_output *wlr_output = output->wlr_output;
if (!wlr_output) {
return false;
if (!output_is_usable(output)) {
output = view_output(view);
if (!output_is_usable(output)) {
return false;
}
}
struct border margin = ssd_get_margin(view->ssd);
@ -284,7 +283,7 @@ set_fallback_geometry(struct view *view)
{
view->natural_geometry.width = LAB_FALLBACK_WIDTH;
view->natural_geometry.height = LAB_FALLBACK_HEIGHT;
view_compute_centered_position(view,
view_compute_centered_position(view, NULL,
view->natural_geometry.width,
view->natural_geometry.height,
&view->natural_geometry.x,
@ -316,11 +315,11 @@ view_store_natural_geometry(struct view *view)
}
void
view_center(struct view *view)
view_center(struct view *view, struct output *output)
{
assert(view);
int x, y;
if (view_compute_centered_position(view, view->pending.width,
if (view_compute_centered_position(view, output, view->pending.width,
view->pending.height, &x, &y)) {
view_move(view, x, y);
}
@ -337,8 +336,8 @@ view_apply_natural_geometry(struct view *view)
} else {
/* reposition if original geometry is offscreen */
struct wlr_box box = view->natural_geometry;
if (view_compute_centered_position(view, box.width, box.height,
&box.x, &box.y)) {
if (view_compute_centered_position(view, NULL, box.width,
box.height, &box.x, &box.y)) {
view_move_resize(view, box);
}
}
@ -745,7 +744,7 @@ view_adjust_for_layout_change(struct view *view)
/* reposition view if it's offscreen */
if (!wlr_output_layout_intersects(view->server->output_layout,
NULL, &view->pending)) {
view_center(view);
view_center(view, NULL);
}
}
if (view->toplevel.handle) {

6
src/xdg.c
View file

@ -278,11 +278,7 @@ position_xdg_toplevel_view(struct view *view)
xdg_toplevel_from_view(view)->parent;
if (!parent_xdg_toplevel) {
struct wlr_box box =
output_usable_area_from_cursor_coords(view->server);
view->current.x = box.x;
view->current.y = box.y;
view_center(view);
view_center(view, output_from_cursor_coords(view->server));
} else {
/*
* If child-toplevel-views, we center-align relative to their

6
src/xwayland.c
View file

@ -440,11 +440,7 @@ set_initial_position(struct view *view,
/* Just make sure the view is on-screen */
view_adjust_for_layout_change(view);
} else {
struct wlr_box box =
output_usable_area_from_cursor_coords(view->server);
view->current.x = box.x;
view->current.y = box.y;
view_center(view);
view_center(view, output_from_cursor_coords(view->server));
}
}