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/ipc-json.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/ipc-json.c')
-rw-r--r-- | sway/ipc-json.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sway/ipc-json.c b/sway/ipc-json.c index 4d9a87d8..110b958a 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c | |||
@@ -246,10 +246,10 @@ static void ipc_json_describe_view(struct sway_container *c, json_object *object | |||
246 | json_object_object_add(object, "marks", marks); | 246 | json_object_object_add(object, "marks", marks); |
247 | 247 | ||
248 | struct wlr_box window_box = { | 248 | struct wlr_box window_box = { |
249 | c->view->x - c->x, | 249 | c->content_x - c->x, |
250 | (c->current.border == B_PIXEL) ? c->current.border_thickness : 0, | 250 | (c->current.border == B_PIXEL) ? c->current.border_thickness : 0, |
251 | c->view->width, | 251 | c->content_width, |
252 | c->view->height | 252 | c->content_height |
253 | }; | 253 | }; |
254 | 254 | ||
255 | json_object_object_add(object, "window_rect", ipc_json_create_rect(&window_box)); | 255 | 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 | |||
258 | 258 | ||
259 | if (c->current.border == B_NORMAL) { | 259 | if (c->current.border == B_NORMAL) { |
260 | deco_box.width = c->width; | 260 | deco_box.width = c->width; |
261 | deco_box.height = c->view->y - c->y; | 261 | deco_box.height = c->content_y - c->y; |
262 | } | 262 | } |
263 | 263 | ||
264 | json_object_object_add(object, "deco_rect", ipc_json_create_rect(&deco_box)); | 264 | json_object_object_add(object, "deco_rect", ipc_json_create_rect(&deco_box)); |