diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-09-13 17:02:10 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-09-13 17:02:10 +1000 |
commit | 2f6935e00f67c8cd81119504437ddf8e789f6eb3 (patch) | |
tree | 35a5e437cd6ff2bb7404dee2a8bd8b7527cc0294 | |
parent | Merge pull request #2622 from ianyfan/i3bar-block-ref (diff) | |
download | sway-2f6935e00f67c8cd81119504437ddf8e789f6eb3.tar.gz sway-2f6935e00f67c8cd81119504437ddf8e789f6eb3.tar.zst sway-2f6935e00f67c8cd81119504437ddf8e789f6eb3.zip |
Remove bad assertion in workspace_rejigger
The assertion can be (rightfully) triggered by creating layout
V[H[view view] view] and moving the top right view to the right.
After removing the assertion I found the container being moved needs its
size reset to prevent it from being sized wrongly after arranging.
-rw-r--r-- | sway/commands/move.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sway/commands/move.c b/sway/commands/move.c index cd970983..8f0ef230 100644 --- a/sway/commands/move.c +++ b/sway/commands/move.c | |||
@@ -259,9 +259,6 @@ static void container_move_to_container(struct sway_container *container, | |||
259 | * In other words, rejigger it. */ | 259 | * In other words, rejigger it. */ |
260 | static void workspace_rejigger(struct sway_workspace *ws, | 260 | static void workspace_rejigger(struct sway_workspace *ws, |
261 | struct sway_container *child, enum movement_direction move_dir) { | 261 | struct sway_container *child, enum movement_direction move_dir) { |
262 | if (!sway_assert(child->parent == NULL, "Expected a root child")) { | ||
263 | return; | ||
264 | } | ||
265 | container_detach(child); | 262 | container_detach(child); |
266 | workspace_wrap_children(ws); | 263 | workspace_wrap_children(ws); |
267 | 264 | ||
@@ -270,6 +267,7 @@ static void workspace_rejigger(struct sway_workspace *ws, | |||
270 | ws->layout = | 267 | ws->layout = |
271 | move_dir == MOVE_LEFT || move_dir == MOVE_RIGHT ? L_HORIZ : L_VERT; | 268 | move_dir == MOVE_LEFT || move_dir == MOVE_RIGHT ? L_HORIZ : L_VERT; |
272 | workspace_update_representation(ws); | 269 | workspace_update_representation(ws); |
270 | child->width = child->height = 0; | ||
273 | } | 271 | } |
274 | 272 | ||
275 | static void move_out_of_tabs_stacks(struct sway_container *container, | 273 | static void move_out_of_tabs_stacks(struct sway_container *container, |