aboutsummaryrefslogtreecommitdiff
path: root/rootston
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2018-03-13 22:09:44 +0100
committeremersion <contact@emersion.fr>2018-03-13 22:09:44 +0100
commit149209b72ed069f3c6026e6bf7ffb4ffff0de190 (patch)
treed4924f9bf3f7b5b082cdb3483a074c1d222541f8 /rootston
parent657e5c8c0d162958f96c45069767acfa56075843 (diff)
xdg-shell-v6: rename toplevel and popup fields in wlr_xdg_surface_v6 for consistency
Diffstat (limited to 'rootston')
-rw-r--r--rootston/xdg_shell_v6.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/rootston/xdg_shell_v6.c b/rootston/xdg_shell_v6.c
index 84c76d16..59637105 100644
--- a/rootston/xdg_shell_v6.c
+++ b/rootston/xdg_shell_v6.c
@@ -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);
}
}