Merge pull request #2466 from RyanDwyer/geometry

Fix geometry

2 files changed, 13 insertions, 2 deletions

diff --git a/include/sway/desktop.h b/include/sway/desktop.h
index 348fb187..c969a76b 100644
--- a/include/sway/desktop.h
+++ b/include/sway/desktop.h
@@ -1,8 +1,13 @@
 #include <wlr/types/wlr_surface.h>
 
 struct sway_container;
+struct sway_view;
 
 void desktop_damage_surface(struct wlr_surface *surface, double lx, double ly,
 	bool whole);
 
 void desktop_damage_whole_container(struct sway_container *con);
+
+void desktop_damage_box(struct wlr_box *box);
+
+void desktop_damage_view(struct sway_view *view);
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index c2225bcb..2747e7c4 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -88,6 +88,14 @@ struct sway_view {
 	struct wlr_buffer *saved_buffer;
 	int saved_buffer_width, saved_buffer_height;
 
+	// The geometry for whatever the client is committing, regardless of
+	// transaction state. Updated on every commit.
+	struct wlr_box geometry;
+
+	// The "old" geometry during a transaction. Used to damage the old location
+	// when a transaction is applied.
+	struct wlr_box saved_geometry;
+
 	bool destroying;
 
 	list_t *executed_criteria; // struct criteria *
@@ -285,8 +293,6 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface);
 
 void view_unmap(struct sway_view *view);
 
-void view_update_position(struct sway_view *view, double lx, double ly);
-
 void view_update_size(struct sway_view *view, int width, int height);
 
 void view_child_init(struct sway_view_child *child,