alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix getting adjacent output

Browse source
This commit is contained in:
Ryan Dwyer 2018-05-27 09:46:40 +10:00
parent becceafa7f
commit 40af5d81a1
1 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
sway/tree/layout.c
View file

@ -680,26 +680,6 @@ static struct sway_container *get_swayc_in_output_direction(
return ws; return ws;
} }
static void get_layout_center_position(struct sway_container *container,
int *x, int *y) {
// FIXME view coords are inconsistently referred to in layout/output systems
if (container->type == C_OUTPUT) {
*x = container->x + container->width/2;
*y = container->y + container->height/2;
} else {
struct sway_container *output = container_parent(container, C_OUTPUT);
if (container->type == C_WORKSPACE) {
// Workspace coordinates are actually wrong/arbitrary, but should
// be same as output.
*x = output->x;
*y = output->y;
} else {
*x = output->x + container->x;
*y = output->y + container->y;
}
}
}
static struct sway_container *sway_output_from_wlr(struct wlr_output *output) { static struct sway_container *sway_output_from_wlr(struct wlr_output *output) {
if (output == NULL) { if (output == NULL) {
return NULL; return NULL;
@ -755,8 +735,8 @@ struct sway_container *container_get_in_direction(
"got invalid direction: %d", dir)) { "got invalid direction: %d", dir)) {
return NULL; return NULL;
} }
int lx, ly; int lx = container->x + container->width / 2;
get_layout_center_position(container, &lx, &ly); int ly = container->y + container->height / 2;
struct wlr_output_layout *layout = struct wlr_output_layout *layout =
root_container.sway_root->output_layout; root_container.sway_root->output_layout;
struct wlr_output *wlr_adjacent = struct wlr_output *wlr_adjacent =