mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-26 06:46:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix #5643: in sway's render.c, use floor for rounding

Browse source 
Currently, various floating-point expressions involving
the coordinates of borders, titlebars and content surfaces
are directly assigned to integer values before being passed
to lower-level functions, and so are rounded towards
zero.

Some of these floating-point expressions can have fractional
negative values, so the coordinates of the top-left corners
of titlebars, borders and surfaces are rounded towards
bottom-right, while the coordinates of the bottom-right corners
are rounded towards top-left.

These glitches can be best observed with semi-transparent
titlebars and borders.

Fixed by passing several of these expressions to the floor
function before assignment.
This commit is contained in:
Dimitris Triantafyllidis 2020-09-06 18:59:23 +03:00
parent 7ca9ef12f8
commit 9eedc09ac8
1 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

44
sway/desktop/render.c
View file

@ -261,7 +261,7 @@ static void render_view_toplevels(struct sway_view *view,
output->lx - view->geometry.x; output->lx - view->geometry.x;
double oy = view->container->surface_y - double oy = view->container->surface_y -
output->ly - view->geometry.y; output->ly - view->geometry.y;
output_surface_for_each_surface(output, view->surface, ox, oy, output_surface_for_each_surface(output, view->surface, floor(ox), floor(oy),
render_surface_iterator, &data); render_surface_iterator, &data);
} }
@ -299,10 +299,10 @@ static void render_saved_view(struct sway_view *view,
} }
struct wlr_box box = { struct wlr_box box = {
.x = view->container->surface_x - output->lx - .x = floor(view->container->surface_x - output->lx -
view->saved_geometry.x + saved_buf->x, view->saved_geometry.x + saved_buf->x),
.y = view->container->surface_y - output->ly - .y = floor(view->container->surface_y - output->ly -
view->saved_geometry.y + saved_buf->y, view->saved_geometry.y + saved_buf->y),
.width = saved_buf->width, .width = saved_buf->width,
.height = saved_buf->height, .height = saved_buf->height,
}; };
@ -358,8 +358,8 @@ static void render_view(struct sway_output *output, pixman_region32_t *damage,
if (state->border_left) { if (state->border_left) {
memcpy(&color, colors->child_border, sizeof(float) * 4); memcpy(&color, colors->child_border, sizeof(float) * 4);
premultiply_alpha(color, con->alpha); premultiply_alpha(color, con->alpha);
box.x = state->x; box.x = floor(state->x);
box.y = state->content_y; box.y = floor(state->content_y);
box.width = state->border_thickness; box.width = state->border_thickness;
box.height = state->content_height; box.height = state->content_height;
scale_box(&box, output_scale); scale_box(&box, output_scale);
@ -377,8 +377,8 @@ static void render_view(struct sway_output *output, pixman_region32_t *damage,
memcpy(&color, colors->child_border, sizeof(float) * 4); memcpy(&color, colors->child_border, sizeof(float) * 4);
} }
premultiply_alpha(color, con->alpha); premultiply_alpha(color, con->alpha);
box.x = state->content_x + state->content_width; box.x = floor(state->content_x + state->content_width);
box.y = state->content_y; box.y = floor(state->content_y);
box.width = state->border_thickness; box.width = state->border_thickness;
box.height = state->content_height; box.height = state->content_height;
scale_box(&box, output_scale); scale_box(&box, output_scale);
@ -392,8 +392,8 @@ static void render_view(struct sway_output *output, pixman_region32_t *damage,
memcpy(&color, colors->child_border, sizeof(float) * 4); memcpy(&color, colors->child_border, sizeof(float) * 4);
} }
premultiply_alpha(color, con->alpha); premultiply_alpha(color, con->alpha);
box.x = state->x; box.x = floor(state->x);
box.y = state->content_y + state->content_height; box.y = floor(state->content_y + state->content_height);
box.width = state->width; box.width = state->width;
box.height = state->border_thickness; box.height = state->border_thickness;
scale_box(&box, output_scale); scale_box(&box, output_scale);
@ -670,8 +670,8 @@ static void render_top_border(struct sway_output *output,
// Child border - top edge // Child border - top edge
memcpy(&color, colors->child_border, sizeof(float) * 4); memcpy(&color, colors->child_border, sizeof(float) * 4);
premultiply_alpha(color, con->alpha); premultiply_alpha(color, con->alpha);
box.x = state->x; box.x = floor(state->x);
box.y = state->y; box.y = floor(state->y);
box.width = state->width; box.width = state->width;
box.height = state->border_thickness; box.height = state->border_thickness;
scale_box(&box, output_scale); scale_box(&box, output_scale);
@ -726,8 +726,8 @@ static void render_containers_linear(struct sway_output *output,
} }
if (state->border == B_NORMAL) { if (state->border == B_NORMAL) {
render_titlebar(output, damage, child, state->x, render_titlebar(output, damage, child, floor(state->x),
state->y, state->width, colors, floor(state->y), state->width, colors,
title_texture, marks_texture); title_texture, marks_texture);
} else if (state->border == B_PIXEL) { } else if (state->border == B_PIXEL) {
render_top_border(output, damage, child, colors); render_top_border(output, damage, child, colors);
@ -781,7 +781,7 @@ static void render_containers_tabbed(struct sway_output *output,
marks_texture = child->marks_unfocused; marks_texture = child->marks_unfocused;
} }
int x = cstate->x + tab_width * i; int x = floor(cstate->x + tab_width * i);
// Make last tab use the remaining width of the parent // Make last tab use the remaining width of the parent
if (i == parent->children->length - 1) { if (i == parent->children->length - 1) {
@ -894,8 +894,8 @@ static void render_container(struct sway_output *output,
struct parent_data data = { struct parent_data data = {
.layout = con->current.layout, .layout = con->current.layout,
.box = { .box = {
.x = con->current.x, .x = floor(con->current.x),
.y = con->current.y, .y = floor(con->current.y),
.width = con->current.width, .width = con->current.width,
.height = con->current.height, .height = con->current.height,
}, },
@ -911,8 +911,8 @@ static void render_workspace(struct sway_output *output,
struct parent_data data = { struct parent_data data = {
.layout = ws->current.layout, .layout = ws->current.layout,
.box = { .box = {
.x = ws->current.x, .x = floor(ws->current.x),
.y = ws->current.y, .y = floor(ws->current.y),
.width = ws->current.width, .width = ws->current.width,
.height = ws->current.height, .height = ws->current.height,
}, },
@ -946,8 +946,8 @@ static void render_floating_container(struct sway_output *soutput,
} }
if (con->current.border == B_NORMAL) { if (con->current.border == B_NORMAL) {
render_titlebar(soutput, damage, con, con->current.x, render_titlebar(soutput, damage, con, floor(con->current.x),
con->current.y, con->current.width, colors, floor(con->current.y), con->current.width, colors,
title_texture, marks_texture); title_texture, marks_texture);
} else if (con->current.border == B_PIXEL) { } else if (con->current.border == B_PIXEL) {
render_top_border(soutput, damage, con, colors); render_top_border(soutput, damage, con, colors);