mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-13 05:54:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

arrange_windows_r: Bring parent coordinates into layout calculations.

Browse Source 
This brings consistency into the algorithm (instead of resetting and
then fetching again).
This commit is contained in:
S. Christoffer Eliesen 2015-12-28 01:14:48 +01:00
parent 97a4f7ceac
commit 831f6680f4
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sway/layout.c
View File

@ -434,7 +434,7 @@ static void arrange_windows_r(swayc_t *container, double width, double height) {
sway_log(L_DEBUG, "Arranging layout for %p %s %fx%f+%f,%f", container, sway_log(L_DEBUG, "Arranging layout for %p %s %fx%f+%f,%f", container,
container->name, container->width, container->height, container->x, container->y); container->name, container->width, container->height, container->x, container->y);
int x = 0, y = 0; double x = 0, y = 0;
switch (container->type) { switch (container->type) {
case C_ROOT: case C_ROOT:
for (i = 0; i < container->children->length; ++i) { for (i = 0; i < container->children->length; ++i) {
@ -489,8 +489,8 @@ static void arrange_windows_r(swayc_t *container, double width, double height) {
} }
} }
int gap = swayc_gap(container); int gap = swayc_gap(container);
container->x = x + gap; x = container->x = x + gap;
container->y = y + gap; y = container->y = y + gap;
width = container->width = width - gap * 2; width = container->width = width - gap * 2;
height = container->height = height - gap * 2; height = container->height = height - gap * 2;
sway_log(L_DEBUG, "Arranging workspace '%s' at %f, %f", container->name, container->x, container->y); sway_log(L_DEBUG, "Arranging workspace '%s' at %f, %f", container->name, container->x, container->y);
@ -509,10 +509,11 @@ static void arrange_windows_r(swayc_t *container, double width, double height) {
default: default:
container->width = width; container->width = width;
container->height = height; container->height = height;
x = container->x;
y = container->y;
break; break;
} }
x = y = 0;
double scale = 0; double scale = 0;
switch (container->layout) { switch (container->layout) {
case L_HORIZ: case L_HORIZ:
@ -536,8 +537,8 @@ static void arrange_windows_r(swayc_t *container, double width, double height) {
for (i = 0; i < container->children->length; ++i) { for (i = 0; i < container->children->length; ++i) {
swayc_t *child = container->children->items[i]; swayc_t *child = container->children->items[i];
sway_log(L_DEBUG, "Calculating arrangement for %p:%d (will scale %f by %f)", child, child->type, width, scale); sway_log(L_DEBUG, "Calculating arrangement for %p:%d (will scale %f by %f)", child, child->type, width, scale);
child->x = x + container->x; child->x = x;
child->y = y + container->y; child->y = y;
arrange_windows_r(child, child->width * scale, height); arrange_windows_r(child, child->width * scale, height);
x += child->width; x += child->width;
} }
@ -563,8 +564,8 @@ static void arrange_windows_r(swayc_t *container, double width, double height) {
for (i = 0; i < container->children->length; ++i) { for (i = 0; i < container->children->length; ++i) {
swayc_t *child = container->children->items[i]; swayc_t *child = container->children->items[i];
sway_log(L_DEBUG, "Calculating arrangement for %p:%d (will scale %f by %f)", child, child->type, height, scale); sway_log(L_DEBUG, "Calculating arrangement for %p:%d (will scale %f by %f)", child, child->type, height, scale);
child->x = x + container->x; child->x = x;
child->y = y + container->y; child->y = y;
arrange_windows_r(child, width, child->height * scale); arrange_windows_r(child, width, child->height * scale);
y += child->height; y += child->height;
} }