mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-02-26 01:40:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

use closest wlr_output

Browse source
This commit is contained in:
ARDiDo 2021-10-19 18:15:56 -04:00 • committed by Johan Malm
parent 380b8b295a
commit fffa912fd6
1 changed files with 10 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/view.c
View file

@ -80,23 +80,16 @@ view_minimize(struct view *view, bool minimized)
} }
static struct wlr_output * static struct wlr_output *
view_available_wlr_output(struct view *view) view_closest_wlr_output(struct view *view)
{ {
int corners[4] = {view->x, view->x + view->w, view->y, double closest_x, closest_y;
view->y + view->h}; struct wlr_output *wlr_output = NULL;
int i, j = 2; wlr_output_layout_closest_point(view->server->output_layout, wlr_output,
struct wlr_output *output; view->x + view->w / 2, view->y + view->h / 2, &closest_x,
for (i = 0; i < 4; i++) { &closest_y);
output = wlr_output_layout_output_at(view->server->output_layout, wlr_output = wlr_output_layout_output_at(view->server->output_layout,
corners[i % 2], corners[j] ); closest_x, closest_y);
return wlr_output;
if (output) {
return output;
} else if (i % 2) {
j++;
}
}
return NULL;
} }
/* view_wlr_output - return the output that a view is mostly on */ /* view_wlr_output - return the output that a view is mostly on */
@ -112,7 +105,7 @@ view_output(struct view *view)
{ {
struct wlr_output *wlr_output = view_wlr_output(view); struct wlr_output *wlr_output = view_wlr_output(view);
if (!wlr_output) { if (!wlr_output) {
wlr_output = view_available_wlr_output(view); wlr_output = view_closest_wlr_output(view);
} }
return output_from_wlr_output(view->server, wlr_output); return output_from_wlr_output(view->server, wlr_output);
} }