diff --git a/sway/commands/resize.c b/sway/commands/resize.c index 4038e331b..ca36e858d 100644 --- a/sway/commands/resize.c +++ b/sway/commands/resize.c @@ -224,7 +224,7 @@ static struct cmd_results *resize_adjust_floating(uint32_t axis, } else if (axis == WLR_EDGE_LEFT) { grow_x = -grow_width; } - if (grow_x == 0 && grow_y == 0) { + if (grow_width == 0 && grow_height == 0) { return cmd_results_new(CMD_INVALID, "Cannot resize any further"); } con->x += grow_x; diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c index 11a00b722..bcc3a30b6 100644 --- a/sway/desktop/transaction.c +++ b/sway/desktop/transaction.c @@ -364,11 +364,20 @@ static void transaction_progress_queue(void) { // If there's a bunch of consecutive transactions which all apply to the // same views, skip all except the last one. while (server.transactions->length >= 2) { - struct sway_transaction *a = server.transactions->items[0]; - struct sway_transaction *b = server.transactions->items[1]; - if (transaction_same_nodes(a, b)) { + struct sway_transaction *txn = server.transactions->items[0]; + struct sway_transaction *dup = NULL; + + for (int i = 1; i < server.transactions->length; i++) { + struct sway_transaction *maybe_dup = server.transactions->items[i]; + if (transaction_same_nodes(txn, maybe_dup)) { + dup = maybe_dup; + break; + } + } + + if (dup) { list_del(server.transactions, 0); - transaction_destroy(a); + transaction_destroy(txn); } else { break; } diff --git a/sway/input/seatop_resize_tiling.c b/sway/input/seatop_resize_tiling.c index 0dfafbd07..05be6e701 100644 --- a/sway/input/seatop_resize_tiling.c +++ b/sway/input/seatop_resize_tiling.c @@ -107,6 +107,9 @@ static void handle_unref(struct sway_seat *seat, struct sway_container *con) { if (e->con == con) { seatop_begin_default(seat); } + if (e->h_sib == con || e->v_sib == con) { + seatop_begin_default(seat); + } } static const struct sway_seatop_impl seatop_impl = {