mirror of
https://github.com/swaywm/sway.git
synced 2025-10-31 22:25:26 -04:00
Compare commits
2 commits
357d341f8f
...
f50e307227
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f50e307227 | ||
|
|
87fbcf0574 |
2 changed files with 10 additions and 1 deletions
|
|
@ -134,6 +134,15 @@ struct cmd_results *cmd_layout(int argc, char **argv) {
|
||||||
// Operate on parent container, like i3.
|
// Operate on parent container, like i3.
|
||||||
if (container) {
|
if (container) {
|
||||||
container = container->pending.parent;
|
container = container->pending.parent;
|
||||||
|
// If parent has only a singe child operate on its parent and
|
||||||
|
// flatten once, like i3
|
||||||
|
if (container && container->pending.children->length == 1) {
|
||||||
|
struct sway_container *child = container->pending.children->items[0];
|
||||||
|
struct sway_container *parent = container->pending.parent;
|
||||||
|
container_replace(container, child);
|
||||||
|
container_begin_destroy(container);
|
||||||
|
container = parent;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// We could be working with a container OR a workspace. These are different
|
// We could be working with a container OR a workspace. These are different
|
||||||
|
|
|
||||||
|
|
@ -1111,7 +1111,7 @@ static void handle_rebase(struct sway_seat *seat, uint32_t time_msec) {
|
||||||
cursor->cursor->x, cursor->cursor->y, &surface, &sx, &sy);
|
cursor->cursor->x, cursor->cursor->y, &surface, &sx, &sy);
|
||||||
|
|
||||||
if (surface) {
|
if (surface) {
|
||||||
if (seat_is_input_allowed(seat, surface)) {
|
if (seat_is_input_allowed(seat, surface) && !cursor->hidden) {
|
||||||
wlr_seat_pointer_notify_enter(seat->wlr_seat, surface, sx, sy);
|
wlr_seat_pointer_notify_enter(seat->wlr_seat, surface, sx, sy);
|
||||||
wlr_seat_pointer_notify_motion(seat->wlr_seat, time_msec, sx, sy);
|
wlr_seat_pointer_notify_motion(seat->wlr_seat, time_msec, sx, sy);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue