diff options
author | Kenny Levinsen <kl@kl.wtf> | 2021-04-25 23:19:51 +0200 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2021-04-26 09:24:12 +0200 |
commit | 7ec9d07fc597c739760df5223469e9f15340db78 (patch) | |
tree | d1f9cef4bef49ba5afa687a09379c50d0d3dcf30 | |
parent | tree/view: don't give focus to views mapped under fullscreen views (diff) | |
download | sway-7ec9d07fc597c739760df5223469e9f15340db78.tar.gz sway-7ec9d07fc597c739760df5223469e9f15340db78.tar.zst sway-7ec9d07fc597c739760df5223469e9f15340db78.zip |
Remove usage of surface->sx|sy
These coordinates contain the all-time accumulated buffer attach point,
which is a way to perform incremental client-side initiated movement of
windows, intended as a way to maintain logical window positioning while
compensating for layout changes such as folding in a left side panel.
This value is not useful for implementing this feature, and break things
if they ever become non-zero. Their inclusion in calculations also tend
to cause confusion.
Remove usage of these coordinates, removing the ability for clients to
move themselves. This may again be supported if a better API is made
available from wlroots.
-rw-r--r-- | sway/desktop/output.c | 4 | ||||
-rw-r--r-- | sway/desktop/render.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 6d4f5342..ab8fd7e8 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
@@ -99,8 +99,8 @@ static bool get_surface_box(struct surface_iterator_data *data, | |||
99 | int sw = surface->current.width; | 99 | int sw = surface->current.width; |
100 | int sh = surface->current.height; | 100 | int sh = surface->current.height; |
101 | 101 | ||
102 | double _sx = sx + surface->sx; | 102 | double _sx = sx; |
103 | double _sy = sy + surface->sy; | 103 | double _sy = sy; |
104 | rotate_child_position(&_sx, &_sy, sw, sh, data->width, data->height, | 104 | rotate_child_position(&_sx, &_sy, sw, sh, data->width, data->height, |
105 | data->rotation); | 105 | data->rotation); |
106 | 106 | ||
diff --git a/sway/desktop/render.c b/sway/desktop/render.c index 56936d53..42d62b90 100644 --- a/sway/desktop/render.c +++ b/sway/desktop/render.c | |||
@@ -159,8 +159,8 @@ static void render_surface_iterator(struct sway_output *output, struct sway_view | |||
159 | struct wlr_box dst_box = *_box; | 159 | struct wlr_box dst_box = *_box; |
160 | struct sway_container *container = data->container; | 160 | struct sway_container *container = data->container; |
161 | if (container != NULL) { | 161 | if (container != NULL) { |
162 | dst_box.width = fmin(dst_box.width, container->current.content_width - surface->sx); | 162 | dst_box.width = fmin(dst_box.width, container->current.content_width); |
163 | dst_box.height = fmin(dst_box.height, container->current.content_height - surface->sy); | 163 | dst_box.height = fmin(dst_box.height, container->current.content_height); |
164 | } | 164 | } |
165 | scale_box(&dst_box, wlr_output->scale); | 165 | scale_box(&dst_box, wlr_output->scale); |
166 | 166 | ||