summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFurkan Sahin <furkan-dev@proton.me>2022-07-23 20:24:57 -0400
committerFurkan Sahin <furkan-dev@proton.me>2022-07-23 20:24:57 -0400
commit453babb04cab0f057c7c77ac42d702c63c4e8c71 (patch)
treea1e2e63903e235dd4ae59b26c64368bf13b51c72
parent54b4fde1433041165e826237ce7b9ef0372c3fbb (diff)
container_floating_set_default_size: Store workspace size box on the stack
-rw-r--r--sway/tree/container.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c
index 04ef965f..bf7085cb 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -787,11 +787,11 @@ void container_floating_set_default_size(struct sway_container *con) {
int min_width, max_width, min_height, max_height;
floating_calculate_constraints(&min_width, &max_width,
&min_height, &max_height);
- struct wlr_box *box = calloc(1, sizeof(struct wlr_box));
- workspace_get_box(con->pending.workspace, box);
+ struct wlr_box box;
+ workspace_get_box(con->pending.workspace, &box);
- double width = fmax(min_width, fmin(box->width * 0.5, max_width));
- double height = fmax(min_height, fmin(box->height * 0.75, max_height));
+ double width = fmax(min_width, fmin(box.width * 0.5, max_width));
+ double height = fmax(min_height, fmin(box.height * 0.75, max_height));
if (!con->view) {
con->pending.width = width;
con->pending.height = height;
@@ -800,8 +800,6 @@ void container_floating_set_default_size(struct sway_container *con) {
con->pending.content_height = height;
container_set_geometry_from_content(con);
}
-
- free(box);
}