diff options
-rw-r--r-- | sway/input/seat.c | 7 | ||||
-rw-r--r-- | swaybar/input.c | 1 | ||||
-rw-r--r-- | swaylock/main.c | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c index 25f454bd..d7733855 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c | |||
@@ -1110,9 +1110,6 @@ static void seat_end_move_tiling(struct sway_seat *seat) { | |||
1110 | int after = edge != WLR_EDGE_TOP && edge != WLR_EDGE_LEFT; | 1110 | int after = edge != WLR_EDGE_TOP && edge != WLR_EDGE_LEFT; |
1111 | 1111 | ||
1112 | container_detach(con); | 1112 | container_detach(con); |
1113 | if (old_parent) { | ||
1114 | container_reap_empty(old_parent); | ||
1115 | } | ||
1116 | 1113 | ||
1117 | // Moving container into empty workspace | 1114 | // Moving container into empty workspace |
1118 | if (target_node->type == N_WORKSPACE && edge == WLR_EDGE_NONE) { | 1115 | if (target_node->type == N_WORKSPACE && edge == WLR_EDGE_NONE) { |
@@ -1135,6 +1132,10 @@ static void seat_end_move_tiling(struct sway_seat *seat) { | |||
1135 | workspace_insert_tiling(new_ws, con, after); | 1132 | workspace_insert_tiling(new_ws, con, after); |
1136 | } | 1133 | } |
1137 | 1134 | ||
1135 | if (old_parent) { | ||
1136 | container_reap_empty(old_parent); | ||
1137 | } | ||
1138 | |||
1138 | // This is a bit dirty, but we'll set the dimensions to that of a sibling. | 1139 | // This is a bit dirty, but we'll set the dimensions to that of a sibling. |
1139 | // I don't think there's any other way to make it consistent without | 1140 | // I don't think there's any other way to make it consistent without |
1140 | // changing how we auto-size containers. | 1141 | // changing how we auto-size containers. |
diff --git a/swaybar/input.c b/swaybar/input.c index 31137f44..d0191f51 100644 --- a/swaybar/input.c +++ b/swaybar/input.c | |||
@@ -4,6 +4,7 @@ | |||
4 | #else | 4 | #else |
5 | #include <linux/input-event-codes.h> | 5 | #include <linux/input-event-codes.h> |
6 | #endif | 6 | #endif |
7 | #include <stdlib.h> | ||
7 | #include <wayland-client.h> | 8 | #include <wayland-client.h> |
8 | #include <wayland-cursor.h> | 9 | #include <wayland-cursor.h> |
9 | #include <wlr/util/log.h> | 10 | #include <wlr/util/log.h> |
diff --git a/swaylock/main.c b/swaylock/main.c index 86dfd577..f2bb5c3e 100644 --- a/swaylock/main.c +++ b/swaylock/main.c | |||
@@ -385,7 +385,6 @@ static void load_image(char *arg, struct swaylock_state *state) { | |||
385 | return; | 385 | return; |
386 | } | 386 | } |
387 | wl_list_insert(&state->images, &image->link); | 387 | wl_list_insert(&state->images, &image->link); |
388 | state->args.mode = BACKGROUND_MODE_FILL; | ||
389 | wlr_log(WLR_DEBUG, "Loaded image %s for output %s", | 388 | wlr_log(WLR_DEBUG, "Loaded image %s for output %s", |
390 | image->path, image->output_name ? image->output_name : "*"); | 389 | image->path, image->output_name ? image->output_name : "*"); |
391 | } | 390 | } |
@@ -851,7 +850,7 @@ int main(int argc, char **argv) { | |||
851 | 850 | ||
852 | enum line_mode line_mode = LM_LINE; | 851 | enum line_mode line_mode = LM_LINE; |
853 | state.args = (struct swaylock_args){ | 852 | state.args = (struct swaylock_args){ |
854 | .mode = BACKGROUND_MODE_SOLID_COLOR, | 853 | .mode = BACKGROUND_MODE_FILL, |
855 | .font = strdup("sans-serif"), | 854 | .font = strdup("sans-serif"), |
856 | .radius = 50, | 855 | .radius = 50, |
857 | .thickness = 10, | 856 | .thickness = 10, |