Merge branch 'master' into drag_mode

This commit is contained in:
hmpthcs 2023-04-16 17:36:05 -04:00 committed by GitHub
commit 32fe8447dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -67,7 +67,13 @@ static void popup_unconstrain(struct sway_xdg_popup *popup) {
struct sway_view *view = popup->child.view;
struct wlr_xdg_popup *wlr_popup = popup->wlr_xdg_popup;
struct sway_output *output = view->container->pending.workspace->output;
struct sway_workspace *workspace = view->container->pending.workspace;
if (!workspace) {
// is null if in the scratchpad
return;
}
struct sway_output *output = workspace->output;
// the output box expressed in the coordinate system of the toplevel parent
// of the popup