summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar S. Christoffer Eliesen <christoffer@eliesen.no>2015-12-18 18:38:12 +0100
committerLibravatar S. Christoffer Eliesen <christoffer@eliesen.no>2015-12-18 23:53:42 +0100
commit0ad5059b6f5f7d1b7cf6df70e3e3bb8dce8ff797 (patch)
treeb8ba5ac2f52dbf1fde583068adbbcc23c9ecdb4c
parentMerge pull request #357 from sce/fix_swaybar_crashes (diff)
downloadsway-0ad5059b6f5f7d1b7cf6df70e3e3bb8dce8ff797.tar.gz
sway-0ad5059b6f5f7d1b7cf6df70e3e3bb8dce8ff797.tar.zst
sway-0ad5059b6f5f7d1b7cf6df70e3e3bb8dce8ff797.zip
layout: arrange_windows: Fix/better debug output.
-rw-r--r--sway/layout.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/sway/layout.c b/sway/layout.c
index 97c857a1..975cb5cb 100644
--- a/sway/layout.c
+++ b/sway/layout.c
@@ -422,10 +422,9 @@ static void arrange_windows_r(swayc_t *container, double width, double height) {
422 switch (container->type) { 422 switch (container->type) {
423 case C_ROOT: 423 case C_ROOT:
424 for (i = 0; i < container->children->length; ++i) { 424 for (i = 0; i < container->children->length; ++i) {
425 swayc_t *child = container->children->items[i]; 425 swayc_t *output = container->children->items[i];
426 sway_log(L_DEBUG, "Arranging output at %d", x); 426 sway_log(L_DEBUG, "Arranging output '%s' at %f,%f", output->name, output->x, output->y);
427 arrange_windows_r(child, -1, -1); 427 arrange_windows_r(output, -1, -1);
428 x += child->width;
429 } 428 }
430 return; 429 return;
431 case C_OUTPUT: 430 case C_OUTPUT:
@@ -456,6 +455,7 @@ static void arrange_windows_r(swayc_t *container, double width, double height) {
456 struct panel_config *config = desktop_shell.panels->items[i]; 455 struct panel_config *config = desktop_shell.panels->items[i];
457 if (config->output == output->handle) { 456 if (config->output == output->handle) {
458 struct wlc_size size = *wlc_surface_get_size(config->surface); 457 struct wlc_size size = *wlc_surface_get_size(config->surface);
458 sway_log(L_DEBUG, "-> Found panel for this workspace: %ux%u, position: %u", size.w, size.h, desktop_shell.panel_position);
459 switch (desktop_shell.panel_position) { 459 switch (desktop_shell.panel_position) {
460 case DESKTOP_SHELL_PANEL_POSITION_TOP: 460 case DESKTOP_SHELL_PANEL_POSITION_TOP:
461 y += size.h; height -= size.h; 461 y += size.h; height -= size.h;
@@ -477,8 +477,7 @@ static void arrange_windows_r(swayc_t *container, double width, double height) {
477 container->y = gap; 477 container->y = gap;
478 container->width = width - gap * 2; 478 container->width = width - gap * 2;
479 container->height = height - gap * 2; 479 container->height = height - gap * 2;
480 sway_log(L_DEBUG, "Arranging workspace #%d at %f, %f", i, container->x, container->y); 480 sway_log(L_DEBUG, "Arranging workspace '%s' at %f, %f", container->name, container->x, container->y);
481
482 } 481 }
483 // children are properly handled below 482 // children are properly handled below
484 break; 483 break;