mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-03-31 07:11:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move view {x,y,width,height} into container struct

Browse source 
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.
This commit is contained in:
Ryan Dwyer 2018-11-17 18:32:03 +10:00
parent cb63321de6
commit be9348d25c
15 changed files with 156 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sway/ipc-json.c
View file

@ -246,10 +246,10 @@ static void ipc_json_describe_view(struct sway_container *c, json_object *object
json_object_object_add(object, "marks", marks);
struct wlr_box window_box = {
c->view->x - c->x,
c->content_x - c->x,
(c->current.border == B_PIXEL) ? c->current.border_thickness : 0,
c->view->width,
c->view->height
c->content_width,
c->content_height
};
json_object_object_add(object, "window_rect", ipc_json_create_rect(&window_box));
@ -258,7 +258,7 @@ static void ipc_json_describe_view(struct sway_container *c, json_object *object
if (c->current.border == B_NORMAL) {
deco_box.width = c->width;
deco_box.height = c->view->y - c->y;
deco_box.height = c->content_y - c->y;
}
json_object_object_add(object, "deco_rect", ipc_json_create_rect(&deco_box));