From: Consolatis <35009135+Consolatis@users.noreply.github.com>
Date: Mon, 30 May 2022 14:34:50 +0000 (+0200)
Subject: Chase wlroots: xdg_popup.geometry
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=1e29d0606dd681a7ed751d92d50c0bc4863defe3;p=proto%2Flabwc.git

Chase wlroots: xdg_popup.geometry

To update the wlroots subproject use
meson subprojects update wlroots

https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3514
---

diff --git a/src/xdg-popup.c b/src/xdg-popup.c
index aea05f4d..e5050fa1 100644
--- a/src/xdg-popup.c
+++ b/src/xdg-popup.c
@@ -27,7 +27,7 @@ static void
 popup_unconstrain(struct view *view, struct wlr_xdg_popup *popup)
 {
 	struct server *server = view->server;
-	struct wlr_box *popup_box = &popup->geometry;
+	struct wlr_box *popup_box = &popup->current.geometry;
 	struct wlr_output_layout *output_layout = server->output_layout;
 	struct wlr_output *wlr_output = wlr_output_layout_output_at(
 		output_layout, view->x + popup_box->x, view->y + popup_box->y);
diff --git a/subprojects/wlroots.wrap b/subprojects/wlroots.wrap
index c8987042..d009f9c5 100644
--- a/subprojects/wlroots.wrap
+++ b/subprojects/wlroots.wrap
@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://gitlab.freedesktop.org/wlroots/wlroots.git
-revision = 1cb6b2cf673a5b580d7ad79ce2b37c14b14b0268
+revision = bb2946f7377b9e71c15457e93f6f9a34712b77de
 
 [provide]
 dependency_names = wlroots