mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-23 08:21:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2025 from RyanDwyer/fix-nested-tabs

Browse source 
Fix nested tabs
This commit is contained in:
emersion 2018-05-24 09:26:40 +01:00 committed by GitHub
parent 50d1b80d50 cdbae9a5e9
commit 66b93c1c18
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
sway/tree/arrange.c
View file

@ -177,29 +177,24 @@ static void apply_vert_layout(struct sway_container *parent) {
child->height = parent->y + parent_offset + parent_height - child->y; child->height = parent->y + parent_offset + parent_height - child->y;
} }
static void apply_tabbed_layout(struct sway_container *parent) { static void apply_tabbed_or_stacked_layout(struct sway_container *parent) {
if (!parent->children->length) { if (!parent->children->length) {
return; return;
} }
size_t parent_offset = 0;
if (parent->parent->layout == L_TABBED) {
parent_offset = container_titlebar_height();
} else if (parent->parent->layout == L_STACKED) {
parent_offset =
container_titlebar_height() * parent->parent->children->length;
}
size_t parent_height = parent->height - parent_offset;
for (int i = 0; i < parent->children->length; ++i) { for (int i = 0; i < parent->children->length; ++i) {
struct sway_container *child = parent->children->items[i]; struct sway_container *child = parent->children->items[i];
child->x = parent->x; child->x = parent->x;
child->y = parent->y; child->y = parent->y + parent_offset;
child->width = parent->width; child->width = parent->width;
child->height = parent->height; child->height = parent_height;
}
}
static void apply_stacked_layout(struct sway_container *parent) {
if (!parent->children->length) {
return;
}
for (int i = 0; i < parent->children->length; ++i) {
struct sway_container *child = parent->children->items[i];
child->x = parent->x;
child->y = parent->y;
child->width = parent->width;
child->height = parent->height;
} }
} }
@ -234,10 +229,8 @@ void arrange_children_of(struct sway_container *parent) {
apply_vert_layout(parent); apply_vert_layout(parent);
break; break;
case L_TABBED: case L_TABBED:
apply_tabbed_layout(parent);
break;
case L_STACKED: case L_STACKED:
apply_stacked_layout(parent); apply_tabbed_or_stacked_layout(parent);
break; break;
default: default:
wlr_log(L_DEBUG, "TODO: arrange layout type %d", parent->layout); wlr_log(L_DEBUG, "TODO: arrange layout type %d", parent->layout);