diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-11-17 18:32:03 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-11-17 21:29:42 +1000 |
commit | be9348d25c9556bdabb83d964a8761f920fc4a11 (patch) | |
tree | c06bde3d10e9bfea04acdd9b055cd596f13d4522 /sway/desktop/xdg_shell_v6.c | |
parent | Merge pull request #3132 from emersion/dispatch-cursor-btn-segfault (diff) | |
download | sway-be9348d25c9556bdabb83d964a8761f920fc4a11.tar.gz sway-be9348d25c9556bdabb83d964a8761f920fc4a11.tar.zst sway-be9348d25c9556bdabb83d964a8761f920fc4a11.zip |
Move view {x,y,width,height} into container struct
This renames/moves the following properties:
* sway_view.{x,y,width,height} ->
sway_container.content_{x,y,width,height}
* This is required to support placeholder containers as they don't
have a view.
* sway_container_state.view_{x,y,width,height} ->
sway_container_state.content_{x,y,width,height}
* To remain consistent with the above.
* sway_container_state.con_{x,y,width,height} ->
sway_container_state.{x,y,width,height}
* The con prefix was there to give it contrast from the view
properties, and is no longer useful.
The function container_set_geometry_from_floating_view has also been
renamed to container_set_geometry_from_content.
Diffstat (limited to 'sway/desktop/xdg_shell_v6.c')
-rw-r--r-- | sway/desktop/xdg_shell_v6.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c index 692cfbf5..4bc83b8e 100644 --- a/sway/desktop/xdg_shell_v6.c +++ b/sway/desktop/xdg_shell_v6.c | |||
@@ -74,8 +74,8 @@ static void popup_unconstrain(struct sway_xdg_popup_v6 *popup) { | |||
74 | // the output box expressed in the coordinate system of the toplevel parent | 74 | // the output box expressed in the coordinate system of the toplevel parent |
75 | // of the popup | 75 | // of the popup |
76 | struct wlr_box output_toplevel_sx_box = { | 76 | struct wlr_box output_toplevel_sx_box = { |
77 | .x = output->lx - view->x, | 77 | .x = output->lx - view->container->content_x, |
78 | .y = output->ly - view->y, | 78 | .y = output->ly - view->container->content_y, |
79 | .width = output->width, | 79 | .width = output->width, |
80 | .height = output->height, | 80 | .height = output->height, |
81 | }; | 81 | }; |
@@ -283,9 +283,11 @@ static void handle_commit(struct wl_listener *listener, void *data) { | |||
283 | } else { | 283 | } else { |
284 | struct wlr_box new_geo; | 284 | struct wlr_box new_geo; |
285 | wlr_xdg_surface_v6_get_geometry(xdg_surface_v6, &new_geo); | 285 | wlr_xdg_surface_v6_get_geometry(xdg_surface_v6, &new_geo); |
286 | struct sway_container *con = view->container; | ||
286 | 287 | ||
287 | if ((new_geo.width != view->width || new_geo.height != view->height) && | 288 | if ((new_geo.width != con->content_width || |
288 | container_is_floating(view->container)) { | 289 | new_geo.height != con->content_height) && |
290 | container_is_floating(con)) { | ||
289 | // A floating view has unexpectedly sent a new size | 291 | // A floating view has unexpectedly sent a new size |
290 | desktop_damage_view(view); | 292 | desktop_damage_view(view); |
291 | view_update_size(view, new_geo.width, new_geo.height); | 293 | view_update_size(view, new_geo.width, new_geo.height); |