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

Pre-multiply alpha for tab decorations

Browse source
This commit is contained in:
Ryan Dwyer 2018-05-21 08:29:52 +10:00
parent 90607dc329
commit 048b29527b
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sway/desktop/output.c
View file

@ -602,6 +602,7 @@ static void render_container_simple(struct sway_output *output,
static void render_tab(struct sway_output *output, pixman_region32_t *damage, static void render_tab(struct sway_output *output, pixman_region32_t *damage,
struct sway_container *parent, int child_index, struct sway_container *parent, int child_index,
struct border_colors *colors, struct wlr_texture *title_texture) { struct border_colors *colors, struct wlr_texture *title_texture) {
struct sway_container *con = parent->children->items[child_index];
float output_scale = output->wlr_output->scale; float output_scale = output->wlr_output->scale;
float color[4]; float color[4];
struct wlr_box box; struct wlr_box box;
@ -615,6 +616,7 @@ static void render_tab(struct sway_output *output, pixman_region32_t *damage,
// Single pixel bar above title // Single pixel bar above title
memcpy(&color, colors->border, sizeof(float) * 4); memcpy(&color, colors->border, sizeof(float) * 4);
premultiply_alpha(color, con->alpha);
box.x = x; box.x = x;
box.y = parent->y; box.y = parent->y;
box.width = tab_width; box.width = tab_width;
@ -665,6 +667,7 @@ static void render_tab(struct sway_output *output, pixman_region32_t *damage,
// Title background - above the text // Title background - above the text
memcpy(&color, colors->background, sizeof(float) * 4); memcpy(&color, colors->background, sizeof(float) * 4);
premultiply_alpha(color, con->alpha);
box.x = x + 1; box.x = x + 1;
box.y = parent->y + 1; box.y = parent->y + 1;
box.width = tab_width - 2; box.width = tab_width - 2;
@ -707,7 +710,7 @@ static void render_tab_content(struct sway_output *output,
if (view->border != B_NONE) { if (view->border != B_NONE) {
if (view->border_left) { if (view->border_left) {
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 + config->border_thickness * 2 + config->font_height; box.y = con->y + config->border_thickness * 2 + config->font_height;
box.width = view->border_thickness; box.width = view->border_thickness;
@ -718,7 +721,7 @@ static void render_tab_content(struct sway_output *output,
if (view->border_right) { if (view->border_right) {
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 = view->x + view->width; box.x = view->x + view->width;
box.y = con->y + config->border_thickness * 2 + config->font_height; box.y = con->y + config->border_thickness * 2 + config->font_height;
box.width = view->border_thickness; box.width = view->border_thickness;
@ -729,7 +732,7 @@ static void render_tab_content(struct sway_output *output,
if (view->border_bottom) { if (view->border_bottom) {
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 = view->y + view->height; box.y = view->y + view->height;
box.width = con->width; box.width = con->width;