xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix alpha of merged faces

Browse Source
This commit is contained in:
Maxime Coste 2020-07-31 15:45:52 +10:00
parent 5292990a0d
commit e3f3297334
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/face.hh
View File

@ -55,7 +55,9 @@ inline Face merge_faces(const Face& base, const Face& face)
int blended = (base.*field * (255 - color.a) + color.*field * color.a) / 255;
return static_cast<unsigned char>(blended <= 255 ? blended : 255);
};
return Color{blend(&Color::r), blend(&Color::g), blend(&Color::b), base.a};
int alpha = color.a + base.a * (255 - color.a) / 255;
return Color{blend(&Color::r), blend(&Color::g), blend(&Color::b),
static_cast<unsigned char>(alpha <= 255 ? alpha : 255)};
};
auto choose = [&](Color Face::*color, Attribute final_attr) {