diff options
author | 2018-08-19 16:07:11 +1000 | |
---|---|---|
committer | 2018-08-19 16:07:11 +1000 | |
commit | 7f22fab3895ff090d5e26936f4e964e081090164 (patch) | |
tree | c5d96041e3270b1d1d50f8a42d91652d615c9938 /include/sway | |
parent | commands: move newly-stickied containers to focused workspace (diff) | |
parent | Merge pull request #2466 from RyanDwyer/geometry (diff) | |
download | sway-7f22fab3895ff090d5e26936f4e964e081090164.tar.gz sway-7f22fab3895ff090d5e26936f4e964e081090164.tar.zst sway-7f22fab3895ff090d5e26936f4e964e081090164.zip |
Merge branch 'master' into commands
Diffstat (limited to 'include/sway')
-rw-r--r-- | include/sway/desktop.h | 5 | ||||
-rw-r--r-- | include/sway/tree/view.h | 10 |
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 @@ | |||
1 | #include <wlr/types/wlr_surface.h> | 1 | #include <wlr/types/wlr_surface.h> |
2 | 2 | ||
3 | struct sway_container; | 3 | struct sway_container; |
4 | struct sway_view; | ||
4 | 5 | ||
5 | void desktop_damage_surface(struct wlr_surface *surface, double lx, double ly, | 6 | void desktop_damage_surface(struct wlr_surface *surface, double lx, double ly, |
6 | bool whole); | 7 | bool whole); |
7 | 8 | ||
8 | void desktop_damage_whole_container(struct sway_container *con); | 9 | void desktop_damage_whole_container(struct sway_container *con); |
10 | |||
11 | void desktop_damage_box(struct wlr_box *box); | ||
12 | |||
13 | 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 { | |||
88 | struct wlr_buffer *saved_buffer; | 88 | struct wlr_buffer *saved_buffer; |
89 | int saved_buffer_width, saved_buffer_height; | 89 | int saved_buffer_width, saved_buffer_height; |
90 | 90 | ||
91 | // The geometry for whatever the client is committing, regardless of | ||
92 | // transaction state. Updated on every commit. | ||
93 | struct wlr_box geometry; | ||
94 | |||
95 | // The "old" geometry during a transaction. Used to damage the old location | ||
96 | // when a transaction is applied. | ||
97 | struct wlr_box saved_geometry; | ||
98 | |||
91 | bool destroying; | 99 | bool destroying; |
92 | 100 | ||
93 | list_t *executed_criteria; // struct criteria * | 101 | list_t *executed_criteria; // struct criteria * |
@@ -285,8 +293,6 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface); | |||
285 | 293 | ||
286 | void view_unmap(struct sway_view *view); | 294 | void view_unmap(struct sway_view *view); |
287 | 295 | ||
288 | void view_update_position(struct sway_view *view, double lx, double ly); | ||
289 | |||
290 | void view_update_size(struct sway_view *view, int width, int height); | 296 | void view_update_size(struct sway_view *view, int width, int height); |
291 | 297 | ||
292 | void view_child_init(struct sway_view_child *child, | 298 | void view_child_init(struct sway_view_child *child, |