Skip to content

Fix fractions when promoting containers #9249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pablocpas wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −1
Open

Fix fractions when promoting containers #9249

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion sway/commands/move.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,9 @@ static bool container_move_in_direction(struct sway_container *container,
} else {
// Container will be promoted
struct sway_container *old_parent = container->pending.parent;
// The container's fractions were relative to its former parent.
container->pending.height = container->pending.width = 0;
container->height_fraction = container->width_fraction = 0;
if (ancestor->pending.parent) {
// Container will move in with its parent
container_insert_child(ancestor->pending.parent, container,
Expand All @@ -404,8 +407,8 @@ static bool container_move_in_direction(struct sway_container *container,
workspace_insert_tiling(ancestor->pending.workspace, container,
index + (offs < 0 ? 0 : 1));
}
// The ancestor remains in the same parent, so preserve its fractions.
ancestor->pending.height = ancestor->pending.width = 0;
ancestor->height_fraction = ancestor->width_fraction = 0;
if (old_parent) {
container_reap_empty(old_parent);
}
Expand Down