diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-07-14 23:14:55 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-07-14 23:14:55 +1000 |
commit | 2032f85d94f2f222282b242116b3e827dd458f6c (patch) | |
tree | d6ad82f79521cdd948985be22630b803af58afea /sway/commands/resize.c | |
parent | Merge pull request #2244 from RyanDwyer/floating-resize (diff) | |
download | sway-2032f85d94f2f222282b242116b3e827dd458f6c.tar.gz sway-2032f85d94f2f222282b242116b3e827dd458f6c.tar.zst sway-2032f85d94f2f222282b242116b3e827dd458f6c.zip |
Simplify transactions by utilising a dirty flag on containers
This PR changes the way we handle transactions to a more simple method.
The new method is to mark containers as dirty from low level code
(eg. arranging, or container_destroy, and eventually seat_set_focus),
then call transaction_commit_dirty which picks up those containers and
runs them through a transaction. The old methods of using transactions
(arrange_and_commit, or creating one manually) are now no longer
possible.
The highest-level code (execute_command and view implementation
handlers) will call transaction_commit_dirty, so most other code just
needs to set containers as dirty. This is done by arranging, but can
also be done by calling container_set_dirty.
Diffstat (limited to 'sway/commands/resize.c')
-rw-r--r-- | sway/commands/resize.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sway/commands/resize.c b/sway/commands/resize.c index 2cf811d8..e657864c 100644 --- a/sway/commands/resize.c +++ b/sway/commands/resize.c | |||
@@ -268,7 +268,7 @@ static void resize_tiled(int amount, enum resize_axis axis) { | |||
268 | } | 268 | } |
269 | } | 269 | } |
270 | 270 | ||
271 | arrange_and_commit(parent->parent); | 271 | arrange_windows(parent->parent); |
272 | } | 272 | } |
273 | 273 | ||
274 | /** | 274 | /** |
@@ -338,7 +338,7 @@ static struct cmd_results *resize_adjust_floating(enum resize_axis axis, | |||
338 | view->height += grow_height; | 338 | view->height += grow_height; |
339 | } | 339 | } |
340 | 340 | ||
341 | arrange_and_commit(con); | 341 | arrange_windows(con); |
342 | 342 | ||
343 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 343 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
344 | } | 344 | } |
@@ -410,7 +410,7 @@ static struct cmd_results *resize_set_floating(struct sway_container *con, | |||
410 | view->height += grow_height; | 410 | view->height += grow_height; |
411 | } | 411 | } |
412 | 412 | ||
413 | arrange_and_commit(con); | 413 | arrange_windows(con); |
414 | 414 | ||
415 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 415 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
416 | } | 416 | } |