From 63a663516362646bd8e2a641c0aa0574f888cca3 Mon Sep 17 00:00:00 2001 From: Kenny Levinsen Date: Mon, 8 Feb 2021 01:45:50 +0100 Subject: view: Read geometry directly in view_update_size --- sway/desktop/xdg_shell.c | 2 +- sway/desktop/xwayland.c | 2 +- sway/tree/view.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'sway') diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c index cbf16662..14880dcd 100644 --- a/sway/desktop/xdg_shell.c +++ b/sway/desktop/xdg_shell.c @@ -297,7 +297,7 @@ static void handle_commit(struct wl_listener *listener, void *data) { desktop_damage_view(view); memcpy(&view->geometry, &new_geo, sizeof(struct wlr_box)); if (container_is_floating(view->container)) { - view_update_size(view, new_geo.width, new_geo.height); + view_update_size(view); transaction_commit_dirty(); transaction_notify_view_ready_immediately(view); } else { diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c index 8b39cf50..4cd5f9d0 100644 --- a/sway/desktop/xwayland.c +++ b/sway/desktop/xwayland.c @@ -412,7 +412,7 @@ static void handle_commit(struct wl_listener *listener, void *data) { desktop_damage_view(view); memcpy(&view->geometry, &new_geo, sizeof(struct wlr_box)); if (container_is_floating(view->container)) { - view_update_size(view, new_geo.width, new_geo.height); + view_update_size(view); transaction_commit_dirty(); } else { view_center_surface(view); diff --git a/sway/tree/view.c b/sway/tree/view.c index 38417874..e62fd018 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -872,10 +872,10 @@ void view_unmap(struct sway_view *view) { view->surface = NULL; } -void view_update_size(struct sway_view *view, int width, int height) { +void view_update_size(struct sway_view *view) { struct sway_container *con = view->container; - con->content_width = width; - con->content_height = height; + con->content_width = view->geometry.width; + con->content_height = view->geometry.height; container_set_geometry_from_content(con); } -- cgit v1.2.3