2 files changed, 14 insertions, 21 deletions

diff --git a/sway/tree/container.c b/sway/tree/container.c
index b3368a2e..b3f3a344 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -522,13 +522,8 @@ static void surface_at_view(struct sway_container *swayc, double lx, double ly,
 		return;
 	}
 	struct sway_view *sview = swayc->sway_view;
-	double view_sx = lx - sview->x;
-	double view_sy = ly - sview->y;
-
-	struct wlr_box geometry;
-	view_get_geometry(sview, &geometry);
-	view_sx += geometry.x;
-	view_sy += geometry.y;
+	double view_sx = lx - sview->x + sview->geometry.x;
+	double view_sy = ly - sview->y + sview->geometry.y;
 
 	double _sx, _sy;
 	struct wlr_surface *_surface = NULL;
diff --git a/sway/tree/view.c b/sway/tree/view.c
index fba0b52d..fbe4bc58 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -162,20 +162,6 @@ void view_get_constraints(struct sway_view *view, double *min_width,
 	}
 }
 
-void view_get_geometry(struct sway_view *view, struct wlr_box *box) {
-	if (view->surface == NULL) {
-		box->x = box->y = box->width = box->height = 0;
-		return;
-	}
-	if (view->impl->get_geometry) {
-		view->impl->get_geometry(view, box);
-		return;
-	}
-	box->x = box->y = 0;
-	box->width = view->surface->current.width;
-	box->height = view->surface->current.height;
-}
-
 uint32_t view_configure(struct sway_view *view, double lx, double ly, int width,
 		int height) {
 	if (view->impl->configure) {
@@ -629,6 +615,18 @@ void view_unmap(struct sway_view *view) {
 	view->surface = NULL;
 }
 
+void view_update_size(struct sway_view *view, int width, int height) {
+	if (!sway_assert(container_is_floating(view->swayc),
+				"Expected a floating container")) {
+		return;
+	}
+	view->width = width;
+	view->height = height;
+	view->swayc->current.view_width = width;
+	view->swayc->current.view_height = height;
+	container_set_geometry_from_floating_view(view->swayc);
+}
+
 static void view_subsurface_create(struct sway_view *view,
 		struct wlr_subsurface *subsurface) {
 	struct sway_view_child *child = calloc(1, sizeof(struct sway_view_child));