chase wlroots: xwayland separate maximized axis MR 4670

Ref: ceb4fcedca30d323a05836b0872bfe773a047ccc
("xwm: expose individual axis for _set_maximized()")
This commit is contained in:
Consolatis 2024-11-27 03:53:28 +01:00 committed by Johan Malm
parent a617accfd8
commit 1eaba4af33
5 changed files with 8 additions and 7 deletions

View file

@ -140,7 +140,7 @@ struct view_impl {
* minimizing we don't destroy the foreign toplevel handle). * minimizing we don't destroy the foreign toplevel handle).
*/ */
void (*unmap)(struct view *view, bool client_request); 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); void (*minimize)(struct view *view, bool minimize);
struct view *(*get_root)(struct view *self); struct view *(*get_root)(struct view *self);
void (*append_children)(struct view *self, struct wl_array *children); void (*append_children)(struct view *self, struct wl_array *children);

View file

@ -1339,7 +1339,7 @@ static void
set_maximized(struct view *view, enum view_axis maximized) set_maximized(struct view *view, enum view_axis maximized)
{ {
if (view->impl->maximize) { if (view->impl->maximize) {
view->impl->maximize(view, (maximized == VIEW_AXIS_BOTH)); view->impl->maximize(view, maximized);
} }
view->maximized = maximized; view->maximized = maximized;

View file

@ -493,9 +493,10 @@ xdg_toplevel_view_close(struct view *view)
} }
static void 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 static void

View file

@ -810,10 +810,10 @@ out:
} }
static void 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), wlr_xwayland_surface_set_maximized(xwayland_surface_from_view(view),
maximized); maximized & VIEW_AXIS_HORIZONTAL, maximized & VIEW_AXIS_VERTICAL);
} }
static void static void

View file

@ -1,6 +1,6 @@
[wrap-git] [wrap-git]
url = https://gitlab.freedesktop.org/wlroots/wlroots.git url = https://gitlab.freedesktop.org/wlroots/wlroots.git
revision = d3b7e040af46ab03114d5a40e9ed0c7c6aff15be revision = ceb4fcedca30d323a05836b0872bfe773a047ccc
[provide] [provide]
dependency_names = wlroots-0.19 dependency_names = wlroots-0.19