mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-26 06:46:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into master

Browse source
This commit is contained in:
TheAvidDev 2020-10-05 01:12:28 -04:00
commit a69a90b4d1
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
sway/commands/move.c
View file

@ -311,9 +311,10 @@ static bool container_move_in_direction(struct sway_container *container,
// If container is in a split container by itself, move out of the split // If container is in a split container by itself, move out of the split
if (container->parent) { if (container->parent) {
struct sway_container *old_parent = container->parent;
struct sway_container *new_parent = struct sway_container *new_parent =
container_flatten(container->parent); container_flatten(container->parent);
if (new_parent != container->parent) { if (new_parent != old_parent) {
return true; return true;
} }
} }

4
sway/desktop/render.c
View file

@ -372,7 +372,7 @@ static void render_view(struct sway_output *output, pixman_region32_t *damage,
container_current_parent_layout(con); container_current_parent_layout(con);
if (state->border_right) { if (state->border_right) {
if (con->current.parent && siblings->length == 1 && layout == L_HORIZ) { if (!container_is_floating(con) && siblings->length == 1 && layout == L_HORIZ) {
memcpy(&color, colors->indicator, sizeof(float) * 4); memcpy(&color, colors->indicator, sizeof(float) * 4);
} else { } else {
memcpy(&color, colors->child_border, sizeof(float) * 4); memcpy(&color, colors->child_border, sizeof(float) * 4);
@ -387,7 +387,7 @@ static void render_view(struct sway_output *output, pixman_region32_t *damage,
} }
if (state->border_bottom) { if (state->border_bottom) {
if (con->current.parent && siblings->length == 1 && layout == L_VERT) { if (!container_is_floating(con) && siblings->length == 1 && layout == L_VERT) {
memcpy(&color, colors->indicator, sizeof(float) * 4); memcpy(&color, colors->indicator, sizeof(float) * 4);
} else { } else {
memcpy(&color, colors->child_border, sizeof(float) * 4); memcpy(&color, colors->child_border, sizeof(float) * 4);