alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

[fix] corner cases win nb_children < nb_master|nb_col

Browse source
This commit is contained in:
wil 2017-01-07 18:09:42 +01:00
parent bd415029ba
commit d99efb5f6f
1 changed files with 40 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
sway/layout.c
View file

@ -1504,12 +1504,33 @@ bool is_auto_layout(enum swayc_layouts layout) {
return (layout >= L_AUTO_FIRST) && (layout <= L_AUTO_LAST); return (layout >= L_AUTO_FIRST) && (layout <= L_AUTO_LAST);
} }
/**
* Return the number of master elements in a container
*/
static inline size_t auto_master_count(swayc_t *container) {
return MIN(container->nb_master, container->children->length);
}
/** /**
* Return the number of children in the slave groups. This corresponds to the children * Return the number of children in the slave groups. This corresponds to the children
* that are not members of the master group. * that are not members of the master group.
*/ */
static inline size_t auto_slave_count(swayc_t *container) { static inline size_t auto_slave_count(swayc_t *container) {
return container->children->length - container->nb_master; return container->children->length - auto_master_count(container);
}
/**
* Return the number of slave groups in the container.
*/
size_t auto_slave_group_count(swayc_t *container) {
return MIN(container->nb_slave_groups, auto_slave_count(container));
}
/**
* Return the combined number of master and slave groups in the container.
*/
size_t auto_group_count(swayc_t *container) {
return auto_slave_group_count(container) + (container->nb_master ? 1 : 0);
} }
/** /**
@ -1521,10 +1542,12 @@ int auto_group_start_index(swayc_t *container, int index) {
|| (size_t) index < container->nb_master) { || (size_t) index < container->nb_master) {
return 0; return 0;
} else { } else {
size_t grp_sz = auto_slave_count(container) / container->nb_slave_groups; size_t nb_slaves = auto_slave_count(container);
size_t remainder = auto_slave_count(container) % container->nb_slave_groups; size_t nb_slave_grp = auto_slave_group_count(container);
size_t grp_sz = nb_slaves / nb_slave_grp;
size_t remainder = nb_slaves % nb_slave_grp;
int idx2 = (nb_slave_grp - remainder) * grp_sz + container->nb_master;
int start_idx; int start_idx;
int idx2 = (container->nb_slave_groups - remainder) * grp_sz + container->nb_master;
if (index < idx2) { if (index < idx2) {
start_idx = ((index - container->nb_master) / grp_sz) * grp_sz + container->nb_master; start_idx = ((index - container->nb_master) / grp_sz) * grp_sz + container->nb_master;
} else { } else {
@ -1545,11 +1568,13 @@ int auto_group_end_index(swayc_t *container, int index) {
} else { } else {
int nxt_idx; int nxt_idx;
if ((size_t)index < container->nb_master) { if ((size_t)index < container->nb_master) {
nxt_idx = container->nb_master; nxt_idx = auto_master_count(container);
} else { } else {
size_t grp_sz = auto_slave_count(container) / container->nb_slave_groups; size_t nb_slaves = auto_slave_count(container);
size_t remainder = auto_slave_count(container) % container->nb_slave_groups; size_t nb_slave_grp = auto_slave_group_count(container);
int idx2 = (container->nb_slave_groups - remainder) * grp_sz + container->nb_master; size_t grp_sz = nb_slaves / nb_slave_grp;
size_t remainder = nb_slaves % nb_slave_grp;
int idx2 = (nb_slave_grp - remainder) * grp_sz + container->nb_master;
if (index < idx2) { if (index < idx2) {
nxt_idx = ((index - container->nb_master) / grp_sz + 1) * grp_sz + container->nb_master; nxt_idx = ((index - container->nb_master) / grp_sz + 1) * grp_sz + container->nb_master;
} else { } else {
@ -1560,13 +1585,6 @@ int auto_group_end_index(swayc_t *container, int index) {
} }
} }
/**
* Return the combined number of master and slave groups in the container.
*/
size_t auto_group_count(swayc_t *container) {
return MIN(container->nb_slave_groups, auto_slave_count(container)) + (container->nb_master ? 1 : 0);
}
/** /**
* return the index of the Group containing <index>th child of <container>. * return the index of the Group containing <index>th child of <container>.
* The index is the order of the group along the container's major axis (starting at 0). * The index is the order of the group along the container's major axis (starting at 0).
@ -1576,22 +1594,23 @@ size_t auto_group_index(swayc_t *container, int index) {
return 0; return 0;
} }
bool master_first = (container->layout == L_AUTO_LEFT || container->layout == L_AUTO_TOP); bool master_first = (container->layout == L_AUTO_LEFT || container->layout == L_AUTO_TOP);
int nb_slaves = auto_slave_count(container); size_t nb_slaves = auto_slave_count(container);
if ((size_t) index < container->nb_master) { if ((size_t) index < container->nb_master) {
if (master_first || nb_slaves <= 0) { if (master_first || nb_slaves <= 0) {
return 0; return 0;
} else { } else {
return MIN(container->nb_slave_groups, nb_slaves); return auto_slave_group_count(container);
} }
} else { } else {
size_t grp_sz = auto_slave_count(container) / container->nb_slave_groups; size_t nb_slave_grp = auto_slave_group_count(container);
size_t remainder = auto_slave_count(container) % container->nb_slave_groups; size_t grp_sz = nb_slaves / nb_slave_grp;
size_t remainder = nb_slaves % nb_slave_grp;
int idx2 = (nb_slave_grp - remainder) * grp_sz + container->nb_master;
size_t grp_idx; size_t grp_idx;
int idx2 = (container->nb_slave_groups - remainder) * grp_sz + container->nb_master;
if (index < idx2) { if (index < idx2) {
grp_idx = (index - container->nb_master) / grp_sz; grp_idx = (index - container->nb_master) / grp_sz;
} else { } else {
grp_idx = (container->nb_slave_groups - remainder) + (index - idx2) / (grp_sz + 1) ; grp_idx = (nb_slave_grp - remainder) + (index - idx2) / (grp_sz + 1) ;
} }
return grp_idx + (master_first ? 1 : 0); return grp_idx + (master_first ? 1 : 0);
} }