KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix background_tint with background_opacity < 1 causing colors in cell area and padding to not match

Browse Source
This commit is contained in:
Kovid Goyal 2022-10-19 19:24:37 +05:30
parent 4f90110a7c
commit 90e80477e9
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kitty/shaders.c
View File

@ -981,7 +981,7 @@ draw_borders(ssize_t vao_idx, unsigned int num_border_rects, BorderRect *rect_bu
BLEND_ONTO_OPAQUE; BLEND_ONTO_OPAQUE;
background_opacity = 1.0f; background_opacity = 1.0f;
tint_opacity = OPT(background_tint); tint_opacity = OPT(background_tint);
tint_premult = 1.0f; tint_premult = w->is_semi_transparent ? OPT(background_tint) : 1.0f;
} }
if (num_border_rects) { if (num_border_rects) {
@ -1006,7 +1006,10 @@ draw_borders(ssize_t vao_idx, unsigned int num_border_rects, BorderRect *rect_bu
color_type default_bg = (num_visible_windows > 1 && !all_windows_have_same_bg) ? OPT(background) : active_window_bg; color_type default_bg = (num_visible_windows > 1 && !all_windows_have_same_bg) ? OPT(background) : active_window_bg;
glUniform3f(border_uniform_locations[BORDER_default_bg], CV3(default_bg)); glUniform3f(border_uniform_locations[BORDER_default_bg], CV3(default_bg));
#undef CV3 #undef CV3
if (!w->is_semi_transparent && has_bgimage(w)) { BLEND_ONTO_OPAQUE_WITH_OPAQUE_OUTPUT } if (has_bgimage(w)) {
if (w->is_semi_transparent) { BLEND_PREMULT; }
else { BLEND_ONTO_OPAQUE_WITH_OPAQUE_OUTPUT; }
}
glDrawArraysInstanced(GL_TRIANGLE_FAN, 0, 4, num_border_rects); glDrawArraysInstanced(GL_TRIANGLE_FAN, 0, 4, num_border_rects);
unbind_vertex_array(); unbind_vertex_array();
unbind_program(); unbind_program();