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 0ff42c85a583016ce532f52adf545aacc668613c..dc309cddfe294e28aacc3a88b3aa77baeb5f59a1 100644 (file)
--- 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 89743ecdb5b8efd922bd19303a0fdd9b291d0ffe..c673a4ef1d7fa6ef8625ac72e8ccc71a7ccbda66 100644 (file)
--- 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 5bb8fa1749becd6e62d0e8d47845fbcc5a318c85..247500917ec8621fcdc0306777e1315063f28710 100644 (file)
--- 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 16850533b018160bfb9a94fe5f513582a25d233c..3462929db8299e6a34e1ba5dfe304066809507c1 100644 (file)
--- 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 83e713dc469ca6e20d69f2788ce5db2492fe10d4..dde554538db56ecd072e2815f21082c5241add6d 100644 (file)
--- 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