From: Consolatis <35009135+Consolatis@users.noreply.github.com>
Date: Wed, 27 Nov 2024 02:53:28 +0000 (+0100)
Subject: chase wlroots: xwayland separate maximized axis MR 4670
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=1eaba4af33ba78ec3991815a75e01ed0246a2438;p=proto%2Flabwc.git

chase wlroots: xwayland separate maximized axis MR 4670

Ref: ceb4fcedca30d323a05836b0872bfe773a047ccc
("xwm: expose individual axis for _set_maximized()")
---

diff --git a/include/view.h b/include/view.h
index 0ff42c85..dc309cdd 100644
--- a/include/view.h
+++ b/include/view.h
@@ -140,7 +140,7 @@ struct view_impl {
 	 * minimizing we don't destroy the foreign toplevel handle).
 	 */
 	void (*unmap)(struct view *view, bool client_request);
-	void (*maximize)(struct view *view, bool maximize);
+	void (*maximize)(struct view *view, enum view_axis maximized);
 	void (*minimize)(struct view *view, bool minimize);
 	struct view *(*get_root)(struct view *self);
 	void (*append_children)(struct view *self, struct wl_array *children);
diff --git a/src/view.c b/src/view.c
index 89743ecd..c673a4ef 100644
--- a/src/view.c
+++ b/src/view.c
@@ -1339,7 +1339,7 @@ static void
 set_maximized(struct view *view, enum view_axis maximized)
 {
 	if (view->impl->maximize) {
-		view->impl->maximize(view, (maximized == VIEW_AXIS_BOTH));
+		view->impl->maximize(view, maximized);
 	}
 
 	view->maximized = maximized;
diff --git a/src/xdg.c b/src/xdg.c
index 5bb8fa17..24750091 100644
--- a/src/xdg.c
+++ b/src/xdg.c
@@ -493,9 +493,10 @@ xdg_toplevel_view_close(struct view *view)
 }
 
 static void
-xdg_toplevel_view_maximize(struct view *view, bool maximized)
+xdg_toplevel_view_maximize(struct view *view, enum view_axis maximized)
 {
-	wlr_xdg_toplevel_set_maximized(xdg_toplevel_from_view(view), maximized);
+	wlr_xdg_toplevel_set_maximized(xdg_toplevel_from_view(view),
+		maximized == VIEW_AXIS_BOTH);
 }
 
 static void
diff --git a/src/xwayland.c b/src/xwayland.c
index 16850533..3462929d 100644
--- a/src/xwayland.c
+++ b/src/xwayland.c
@@ -810,10 +810,10 @@ out:
 }
 
 static void
-xwayland_view_maximize(struct view *view, bool maximized)
+xwayland_view_maximize(struct view *view, enum view_axis maximized)
 {
 	wlr_xwayland_surface_set_maximized(xwayland_surface_from_view(view),
-		maximized);
+		maximized & VIEW_AXIS_HORIZONTAL, maximized & VIEW_AXIS_VERTICAL);
 }
 
 static void
diff --git a/subprojects/wlroots.wrap b/subprojects/wlroots.wrap
index 83e713dc..dde55453 100644
--- a/subprojects/wlroots.wrap
+++ b/subprojects/wlroots.wrap
@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://gitlab.freedesktop.org/wlroots/wlroots.git
-revision = d3b7e040af46ab03114d5a40e9ed0c7c6aff15be
+revision = ceb4fcedca30d323a05836b0872bfe773a047ccc
 
 [provide]
 dependency_names = wlroots-0.19