mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-02 09:01:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

surface: move position and scale out of wlr_surface_state

Browse source
This commit is contained in:
emersion 2018-06-28 23:49:40 +01:00
parent 233bfe2f4f
commit 78555abba3
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
4 changed files with 120 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

11
rootston/output.c
View file

@ -146,8 +146,8 @@ static bool surface_intersect_output(struct wlr_surface *surface,
double ox = lx, oy = ly;
wlr_output_layout_output_coords(output_layout, wlr_output, &ox, &oy);
ox += surface->current.sx;
oy += surface->current.sy;
ox += surface->sx;
oy += surface->sy;
if (box != NULL) {
box->x = ox * wlr_output->scale;
@ -695,9 +695,14 @@ static void damage_from_surface(struct wlr_surface *surface, int sx, int sy,
int center_x = box.x + box.width/2;
int center_y = box.y + box.height/2;
enum wl_output_transform transform =
wlr_output_transform_invert(surface->current.transform);
pixman_region32_t damage;
pixman_region32_init(&damage);
pixman_region32_copy(&damage, &surface->current.damage);
pixman_region32_copy(&damage, &surface->buffer_damage);
wlr_region_transform(&damage, &damage, transform,
surface->current.buffer_width, surface->current.buffer_height);
wlr_region_scale(&damage, &damage,
wlr_output->scale / (float)surface->current.scale);
if (ceil(wlr_output->scale) > surface->current.scale) {