mirror of
https://github.com/gwenhael-le-moine/sway-patched-tray-menu.git
synced 2024-12-27 21:58:16 +01:00
c6368febc8
Prior tof5b9815128
, children of tabbed and stacked containers would have their container size and position set to the same as the tabbed/stacked container. Normally this would be a problem for a layout such as T[V[view]], but there was some code in the arrange functions which would check if the grandparent of the view was a tabbed or stacked container and would offset the view's Y accordingly. Commitf5b9815128
changed the box to exclude the titlebar for all tabbed/stacked children so that the grandparent check could be removed. But this meant the title was not covered in the container and wasn't damaged when the child changed its title. This patch changes it so that a child of a tabbed/stacked container will have its box include the title bar if the child is a view, but not if it's a layout container. This fixes the title damage issue while avoiding the grandparent check in the arrange functions, and matches what we see visually.
280 lines
7.7 KiB
C
280 lines
7.7 KiB
C
#define _POSIX_C_SOURCE 200809L
|
|
#include <ctype.h>
|
|
#include <stdbool.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <wlr/types/wlr_output.h>
|
|
#include <wlr/types/wlr_output_layout.h>
|
|
#include "sway/tree/arrange.h"
|
|
#include "sway/tree/container.h"
|
|
#include "sway/output.h"
|
|
#include "sway/tree/workspace.h"
|
|
#include "sway/tree/view.h"
|
|
#include "list.h"
|
|
#include "log.h"
|
|
|
|
static void apply_horiz_layout(list_t *children, struct wlr_box *parent) {
|
|
if (!children->length) {
|
|
return;
|
|
}
|
|
|
|
// Calculate total width of children
|
|
double total_width = 0;
|
|
for (int i = 0; i < children->length; ++i) {
|
|
struct sway_container *child = children->items[i];
|
|
if (child->width <= 0) {
|
|
if (children->length > 1) {
|
|
child->width = parent->width / (children->length - 1);
|
|
} else {
|
|
child->width = parent->width;
|
|
}
|
|
}
|
|
container_remove_gaps(child);
|
|
total_width += child->width;
|
|
}
|
|
double scale = parent->width / total_width;
|
|
|
|
// Resize windows
|
|
wlr_log(WLR_DEBUG, "Arranging %p horizontally", parent);
|
|
double child_x = parent->x;
|
|
for (int i = 0; i < children->length; ++i) {
|
|
struct sway_container *child = children->items[i];
|
|
child->x = child_x;
|
|
child->y = parent->y;
|
|
child->width = floor(child->width * scale);
|
|
child->height = parent->height;
|
|
child_x += child->width;
|
|
|
|
// Make last child use remaining width of parent
|
|
if (i == children->length - 1) {
|
|
child->width = parent->x + parent->width - child->x;
|
|
}
|
|
container_add_gaps(child);
|
|
}
|
|
}
|
|
|
|
static void apply_vert_layout(list_t *children, struct wlr_box *parent) {
|
|
if (!children->length) {
|
|
return;
|
|
}
|
|
|
|
// Calculate total height of children
|
|
double total_height = 0;
|
|
for (int i = 0; i < children->length; ++i) {
|
|
struct sway_container *child = children->items[i];
|
|
if (child->height <= 0) {
|
|
if (children->length > 1) {
|
|
child->height = parent->height / (children->length - 1);
|
|
} else {
|
|
child->height = parent->height;
|
|
}
|
|
}
|
|
container_remove_gaps(child);
|
|
total_height += child->height;
|
|
}
|
|
double scale = parent->height / total_height;
|
|
|
|
// Resize
|
|
wlr_log(WLR_DEBUG, "Arranging %p vertically", parent);
|
|
double child_y = parent->y;
|
|
for (int i = 0; i < children->length; ++i) {
|
|
struct sway_container *child = children->items[i];
|
|
child->x = parent->x;
|
|
child->y = child_y;
|
|
child->width = parent->width;
|
|
child->height = floor(child->height * scale);
|
|
child_y += child->height;
|
|
|
|
// Make last child use remaining height of parent
|
|
if (i == children->length - 1) {
|
|
child->height = parent->y + parent->height - child->y;
|
|
}
|
|
container_add_gaps(child);
|
|
}
|
|
}
|
|
|
|
static void apply_tabbed_layout(list_t *children, struct wlr_box *parent) {
|
|
if (!children->length) {
|
|
return;
|
|
}
|
|
for (int i = 0; i < children->length; ++i) {
|
|
struct sway_container *child = children->items[i];
|
|
size_t parent_offset = child->view ? 0 : container_titlebar_height();
|
|
container_remove_gaps(child);
|
|
child->x = parent->x;
|
|
child->y = parent->y + parent_offset;
|
|
child->width = parent->width;
|
|
child->height = parent->height - parent_offset;
|
|
container_add_gaps(child);
|
|
}
|
|
}
|
|
|
|
static void apply_stacked_layout(list_t *children, struct wlr_box *parent) {
|
|
if (!children->length) {
|
|
return;
|
|
}
|
|
for (int i = 0; i < children->length; ++i) {
|
|
struct sway_container *child = children->items[i];
|
|
size_t parent_offset = child->view ? 0 :
|
|
container_titlebar_height() * children->length;
|
|
container_remove_gaps(child);
|
|
child->x = parent->x;
|
|
child->y = parent->y + parent_offset;
|
|
child->width = parent->width;
|
|
child->height = parent->height - parent_offset;
|
|
container_add_gaps(child);
|
|
}
|
|
}
|
|
|
|
static void arrange_floating(list_t *floating) {
|
|
for (int i = 0; i < floating->length; ++i) {
|
|
struct sway_container *floater = floating->items[i];
|
|
arrange_container(floater);
|
|
}
|
|
}
|
|
|
|
static void arrange_children(list_t *children,
|
|
enum sway_container_layout layout, struct wlr_box *parent) {
|
|
// Calculate x, y, width and height of children
|
|
switch (layout) {
|
|
case L_HORIZ:
|
|
apply_horiz_layout(children, parent);
|
|
break;
|
|
case L_VERT:
|
|
apply_vert_layout(children, parent);
|
|
break;
|
|
case L_TABBED:
|
|
apply_tabbed_layout(children, parent);
|
|
break;
|
|
case L_STACKED:
|
|
apply_stacked_layout(children, parent);
|
|
break;
|
|
case L_NONE:
|
|
apply_horiz_layout(children, parent);
|
|
break;
|
|
}
|
|
|
|
// Recurse into child containers
|
|
for (int i = 0; i < children->length; ++i) {
|
|
struct sway_container *child = children->items[i];
|
|
arrange_container(child);
|
|
}
|
|
}
|
|
|
|
void arrange_container(struct sway_container *container) {
|
|
if (config->reloading) {
|
|
return;
|
|
}
|
|
if (container->view) {
|
|
view_autoconfigure(container->view);
|
|
node_set_dirty(&container->node);
|
|
return;
|
|
}
|
|
struct wlr_box box;
|
|
container_get_box(container, &box);
|
|
arrange_children(container->children, container->layout, &box);
|
|
node_set_dirty(&container->node);
|
|
}
|
|
|
|
void arrange_workspace(struct sway_workspace *workspace) {
|
|
if (config->reloading) {
|
|
return;
|
|
}
|
|
struct sway_output *output = workspace->output;
|
|
struct wlr_box *area = &output->usable_area;
|
|
wlr_log(WLR_DEBUG, "Usable area for ws: %dx%d@%d,%d",
|
|
area->width, area->height, area->x, area->y);
|
|
workspace_remove_gaps(workspace);
|
|
|
|
double prev_x = workspace->x;
|
|
double prev_y = workspace->y;
|
|
workspace->width = area->width;
|
|
workspace->height = area->height;
|
|
workspace->x = output->wlr_output->lx + area->x;
|
|
workspace->y = output->wlr_output->ly + area->y;
|
|
|
|
// Adjust any floating containers
|
|
double diff_x = workspace->x - prev_x;
|
|
double diff_y = workspace->y - prev_y;
|
|
if (diff_x != 0 || diff_y != 0) {
|
|
for (int i = 0; i < workspace->floating->length; ++i) {
|
|
struct sway_container *floater = workspace->floating->items[i];
|
|
container_floating_translate(floater, diff_x, diff_y);
|
|
double center_x = floater->x + floater->width / 2;
|
|
double center_y = floater->y + floater->height / 2;
|
|
struct wlr_box workspace_box;
|
|
workspace_get_box(workspace, &workspace_box);
|
|
if (!wlr_box_contains_point(&workspace_box, center_x, center_y)) {
|
|
container_floating_move_to_center(floater);
|
|
}
|
|
}
|
|
}
|
|
|
|
workspace_add_gaps(workspace);
|
|
node_set_dirty(&workspace->node);
|
|
wlr_log(WLR_DEBUG, "Arranging workspace '%s' at %f, %f", workspace->name,
|
|
workspace->x, workspace->y);
|
|
if (workspace->fullscreen) {
|
|
struct sway_container *fs = workspace->fullscreen;
|
|
fs->x = output->lx;
|
|
fs->y = output->ly;
|
|
fs->width = output->width;
|
|
fs->height = output->height;
|
|
arrange_container(fs);
|
|
} else {
|
|
struct wlr_box box;
|
|
workspace_get_box(workspace, &box);
|
|
arrange_children(workspace->tiling, workspace->layout, &box);
|
|
arrange_floating(workspace->floating);
|
|
}
|
|
}
|
|
|
|
void arrange_output(struct sway_output *output) {
|
|
if (config->reloading) {
|
|
return;
|
|
}
|
|
const struct wlr_box *output_box = wlr_output_layout_get_box(
|
|
root->output_layout, output->wlr_output);
|
|
output->lx = output_box->x;
|
|
output->ly = output_box->y;
|
|
output->width = output_box->width;
|
|
output->height = output_box->height;
|
|
|
|
for (int i = 0; i < output->workspaces->length; ++i) {
|
|
struct sway_workspace *workspace = output->workspaces->items[i];
|
|
arrange_workspace(workspace);
|
|
}
|
|
}
|
|
|
|
void arrange_root(void) {
|
|
if (config->reloading) {
|
|
return;
|
|
}
|
|
const struct wlr_box *layout_box =
|
|
wlr_output_layout_get_box(root->output_layout, NULL);
|
|
root->x = layout_box->x;
|
|
root->y = layout_box->y;
|
|
root->width = layout_box->width;
|
|
root->height = layout_box->height;
|
|
for (int i = 0; i < root->outputs->length; ++i) {
|
|
struct sway_output *output = root->outputs->items[i];
|
|
arrange_output(output);
|
|
}
|
|
}
|
|
|
|
void arrange_node(struct sway_node *node) {
|
|
switch (node->type) {
|
|
case N_ROOT:
|
|
arrange_root();
|
|
break;
|
|
case N_OUTPUT:
|
|
arrange_output(node->sway_output);
|
|
break;
|
|
case N_WORKSPACE:
|
|
arrange_workspace(node->sway_workspace);
|
|
break;
|
|
case N_CONTAINER:
|
|
arrange_container(node->sway_container);
|
|
break;
|
|
}
|
|
}
|