mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-02 09:01:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

xdg-shell-v6: rename toplevel and popup fields in wlr_xdg_surface_v6 for consistency

Browse source
This commit is contained in:
emersion 2018-03-13 22:09:44 +01:00
parent 657e5c8c0d
commit 149209b72e
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
3 changed files with 92 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

8
rootston/xdg_shell_v6.c
View file

@ -85,7 +85,7 @@ static void apply_size_constraints(struct wlr_xdg_surface_v6 *surface,
*dest_width = width;
*dest_height = height;
struct wlr_xdg_toplevel_v6_state *state = &surface->toplevel_state->current;
struct wlr_xdg_toplevel_v6_state *state = &surface->toplevel->current;
if (width < state->min_width) {
*dest_width = state->min_width;
} else if (state->max_width > 0 &&
@ -236,7 +236,7 @@ static void handle_request_maximize(struct wl_listener *listener, void *data) {
return;
}
view_maximize(view, surface->toplevel_state->next.maximized);
view_maximize(view, surface->toplevel->next.maximized);
}
static void handle_request_fullscreen(struct wl_listener *listener,
@ -386,10 +386,10 @@ void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
view->destroy = destroy;
roots_surface->view = view;
if (surface->toplevel_state->next.maximized) {
if (surface->toplevel->next.maximized) {
view_maximize(view, true);
}
if (surface->toplevel_state->next.fullscreen) {
if (surface->toplevel->next.fullscreen) {
view_set_fullscreen(view, true, NULL);
}
}