mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-18 14:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2010 from RedSoxFan/premultiply-alpha

Browse source 
Pre-multiply alpha for non-textures
This commit is contained in:
emersion 2018-05-20 20:50:57 +01:00 committed by GitHub
parent cab0dd8281 aacde78daf
commit 4a035a2536
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
sway/desktop/output.c
View file

@ -310,6 +310,13 @@ damage_finish:
pixman_region32_fini(&damage); pixman_region32_fini(&damage);
} }
static void premultiply_alpha(float color[4], float opacity) {
color[3] *= opacity;
color[0] *= color[3];
color[1] *= color[3];
color[2] *= color[3];
}
/** /**
* Render decorations for a view with "border normal". * Render decorations for a view with "border normal".
* *
@ -328,7 +335,7 @@ static void render_container_simple_border_normal(struct sway_output *output,
if (view->border_left) { if (view->border_left) {
// Child border - left edge // Child border - left edge
memcpy(&color, colors->child_border, sizeof(float) * 4); memcpy(&color, colors->child_border, sizeof(float) * 4);
color[3] *= con->alpha; premultiply_alpha(color, con->alpha);
box.x = con->x; box.x = con->x;
box.y = con->y + 1; box.y = con->y + 1;
box.width = view->border_thickness; box.width = view->border_thickness;
@ -346,7 +353,7 @@ static void render_container_simple_border_normal(struct sway_output *output,
} else { } else {
memcpy(&color, colors->child_border, sizeof(float) * 4); memcpy(&color, colors->child_border, sizeof(float) * 4);
} }
color[3] *= con->alpha; premultiply_alpha(color, con->alpha);
box.x = con->x + con->width - view->border_thickness; box.x = con->x + con->width - view->border_thickness;
box.y = con->y + 1; box.y = con->y + 1;
box.width = view->border_thickness; box.width = view->border_thickness;
@ -364,7 +371,7 @@ static void render_container_simple_border_normal(struct sway_output *output,
} else { } else {
memcpy(&color, colors->child_border, sizeof(float) * 4); memcpy(&color, colors->child_border, sizeof(float) * 4);
} }
color[3] *= con->alpha; premultiply_alpha(color, con->alpha);
box.x = con->x; box.x = con->x;
box.y = con->y + con->height - view->border_thickness; box.y = con->y + con->height - view->border_thickness;
box.width = con->width; box.width = con->width;
@ -375,7 +382,7 @@ static void render_container_simple_border_normal(struct sway_output *output,
// Single pixel bar above title // Single pixel bar above title
memcpy(&color, colors->border, sizeof(float) * 4); memcpy(&color, colors->border, sizeof(float) * 4);
color[3] *= con->alpha; premultiply_alpha(color, con->alpha);
box.x = con->x; box.x = con->x;
box.y = con->y; box.y = con->y;
box.width = con->width; box.width = con->width;
@ -390,7 +397,7 @@ static void render_container_simple_border_normal(struct sway_output *output,
// Single pixel bar below title // Single pixel bar below title
memcpy(&color, colors->border, sizeof(float) * 4); memcpy(&color, colors->border, sizeof(float) * 4);
color[3] *= con->alpha; premultiply_alpha(color, con->alpha);
box.x = inner_x; box.x = inner_x;
box.y = view->y - 1; box.y = view->y - 1;
box.width = inner_width; box.width = inner_width;
@ -441,7 +448,7 @@ static void render_container_simple_border_normal(struct sway_output *output,
// Title background - above the text // Title background - above the text
memcpy(&color, colors->background, sizeof(float) * 4); memcpy(&color, colors->background, sizeof(float) * 4);
color[3] *= con->alpha; premultiply_alpha(color, con->alpha);
box.x = inner_x; box.x = inner_x;
box.y = con->y + 1; box.y = con->y + 1;
box.width = inner_width; box.width = inner_width;
@ -481,7 +488,7 @@ static void render_container_simple_border_pixel(struct sway_output *output,
if (view->border_left) { if (view->border_left) {
// Child border - left edge // Child border - left edge
memcpy(&color, colors->child_border, sizeof(float) * 4); memcpy(&color, colors->child_border, sizeof(float) * 4);
color[3] *= con->alpha; premultiply_alpha(color, con->alpha);
box.x = con->x; box.x = con->x;
box.y = con->y + view->border_thickness * view->border_top; box.y = con->y + view->border_thickness * view->border_top;
box.width = view->border_thickness; box.width = view->border_thickness;
@ -499,7 +506,7 @@ static void render_container_simple_border_pixel(struct sway_output *output,
} else { } else {
memcpy(&color, colors->child_border, sizeof(float) * 4); memcpy(&color, colors->child_border, sizeof(float) * 4);
} }
color[3] *= con->alpha; premultiply_alpha(color, con->alpha);
box.x = con->x + con->width - view->border_thickness; box.x = con->x + con->width - view->border_thickness;
box.y = con->y + view->border_thickness * view->border_top; box.y = con->y + view->border_thickness * view->border_top;
box.width = view->border_thickness; box.width = view->border_thickness;
@ -512,7 +519,7 @@ static void render_container_simple_border_pixel(struct sway_output *output,
if (view->border_top) { if (view->border_top) {
// Child border - top edge // Child border - top edge
memcpy(&color, colors->child_border, sizeof(float) * 4); memcpy(&color, colors->child_border, sizeof(float) * 4);
color[3] *= con->alpha; premultiply_alpha(color, con->alpha);
box.x = con->x; box.x = con->x;
box.y = con->y; box.y = con->y;
box.width = con->width; box.width = con->width;
@ -529,7 +536,7 @@ static void render_container_simple_border_pixel(struct sway_output *output,
} else { } else {
memcpy(&color, colors->child_border, sizeof(float) * 4); memcpy(&color, colors->child_border, sizeof(float) * 4);
} }
color[3] *= con->alpha; premultiply_alpha(color, con->alpha);
box.x = con->x; box.x = con->x;
box.y = con->y + con->height - view->border_thickness; box.y = con->y + con->height - view->border_thickness;
box.width = con->width; box.width = con->width;