mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-01-04 11:26:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

cleanup layout.c

Browse source
This commit is contained in:
Tony Crisci 2018-02-14 15:23:56 -05:00
parent 083e11ac7c
commit 780d9fe1e3
1 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
sway/tree/layout.c
View file

@ -173,8 +173,8 @@ void arrange_windows(swayc_t *container, double width, double height) {
height = floor(height); height = floor(height);
wlr_log(L_DEBUG, "Arranging layout for %p %s %fx%f+%f,%f", container, wlr_log(L_DEBUG, "Arranging layout for %p %s %fx%f+%f,%f", container,
container->name, container->width, container->height, container->x, container->name, container->width, container->height, container->x,
container->y); container->y);
double x = 0, y = 0; double x = 0, y = 0;
switch (container->type) { switch (container->type) {
@ -275,8 +275,8 @@ static void apply_horiz_layout(swayc_t *container,
for (int i = start; i < end; ++i) { for (int i = start; i < end; ++i) {
swayc_t *child = container->children->items[i]; swayc_t *child = container->children->items[i];
wlr_log(L_DEBUG, wlr_log(L_DEBUG,
"Calculating arrangement for %p:%d (will scale %f by %f)", "Calculating arrangement for %p:%d (will scale %f by %f)",
child, child->type, width, scale); child, child->type, width, scale);
view_set_position(child->sway_view, child_x, y); view_set_position(child->sway_view, child_x, y);
if (i == end - 1) { if (i == end - 1) {
@ -325,8 +325,8 @@ void apply_vert_layout(swayc_t *container,
for (i = start; i < end; ++i) { for (i = start; i < end; ++i) {
swayc_t *child = container->children->items[i]; swayc_t *child = container->children->items[i];
wlr_log(L_DEBUG, wlr_log(L_DEBUG,
"Calculating arrangement for %p:%d (will scale %f by %f)", "Calculating arrangement for %p:%d (will scale %f by %f)",
child, child->type, height, scale); child, child->type, height, scale);
view_set_position(child->sway_view, x, child_y); view_set_position(child->sway_view, x, child_y);
if (i == end - 1) { if (i == end - 1) {
@ -373,24 +373,23 @@ static swayc_t *get_swayc_in_output_direction(swayc_t *output,
// get most left child of new output // get most left child of new output
return ws->children->items[0]; return ws->children->items[0];
case MOVE_UP: case MOVE_UP:
case MOVE_DOWN: case MOVE_DOWN: {
{ swayc_t *focused = sway_seat_get_focus_inactive(seat, ws);
swayc_t *focused = sway_seat_get_focus_inactive(seat, ws); if (focused && focused->parent) {
if (focused && focused->parent) { swayc_t *parent = focused->parent;
swayc_t *parent = focused->parent; if (parent->layout == L_VERT) {
if (parent->layout == L_VERT) { if (dir == MOVE_UP) {
if (dir == MOVE_UP) { // get child furthest down on new output
// get child furthest down on new output return parent->children->items[parent->children->length-1];
return parent->children->items[parent->children->length-1]; } else if (dir == MOVE_DOWN) {
} else if (dir == MOVE_DOWN) { // get child furthest up on new output
// get child furthest up on new output return parent->children->items[0];
return parent->children->items[0];
}
} }
return focused;
} }
break; return focused;
} }
break;
}
default: default:
break; break;
} }