Skip to content

fix: guard tiling preview without grabbed view #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mateoalfaro wants to merge 1 commit into
base: singularity
Choose a base branch
from
+11 −2
Open

fix: guard tiling preview without grabbed view #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/interactive.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,12 @@ edge_from_cursor(struct seat *seat, struct output **dest_output,
*edge1 = LAB_EDGE_NONE;
*edge2 = LAB_EDGE_NONE;

if (!view_is_floating(server.grabbed_view)) {
/*
* Overlay updates can also be requested by compositor protocols while no
* interactive move is active. In that case there is no edge-snap
* candidate. Do not pass the NULL grabbed view to view_is_floating().
*/
if (!server.grabbed_view || !view_is_floating(server.grabbed_view)) {
return false;
}

Expand Down
4 changes: 4 additions & 0 deletions src/protocols/singularity-tiling.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,10 @@ handle_set_drop_preview(struct wl_client *client, struct wl_resource *resource,
.width = width,
.height = height,
};
if (!manager->drop_preview_active) {
overlay_finish(&server.seat);
return;
}
overlay_update(&server.seat);
}

Expand Down
2 changes: 1 addition & 1 deletion src/regions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ regions_should_snap(void)
if (server.input_mode != LAB_INPUT_STATE_MOVE
|| wl_list_empty(&rc.regions)
|| server.seat.region_prevent_snap
|| !server.grabbed_view
|| !view_is_floating(server.grabbed_view)) {
return false;
}
Expand Down Expand Up @@ -170,4 +171,3 @@ regions_destroy(struct seat *seat, struct wl_list *regions)
zfree(region);
}
}