dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #12127, 555a379: Truncation ellipses rendered shadows even for black font without shadows (#12132)

Browse Source 
(cherry picked from commit bb86023d50)
This commit is contained in:
frosch
2024-02-22 23:22:35 +01:00
committed by Jonathan G Rennison
parent 89b6773c93
commit fcad801685
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gfx.cpp
View File

@@ -555,6 +555,7 @@ static int DrawLayoutLine(const ParagraphLayouter::Line &line, int y, int left,
truncation &= max_w < w; // Whether we need to do truncation. truncation &= max_w < w; // Whether we need to do truncation.
int dot_width = 0; // Cache for the width of the dot. int dot_width = 0; // Cache for the width of the dot.
const Sprite *dot_sprite = nullptr; // Cache for the sprite of the dot. const Sprite *dot_sprite = nullptr; // Cache for the sprite of the dot.
bool dot_has_shadow = false; // Whether the dot's font requires shadows.
if (truncation) { if (truncation) {
/* /*
@@ -564,6 +565,7 @@ static int DrawLayoutLine(const ParagraphLayouter::Line &line, int y, int left,
* the truncation dots. * the truncation dots.
*/ */
FontCache *fc = line.GetVisualRun(0).GetFont()->fc; FontCache *fc = line.GetVisualRun(0).GetFont()->fc;
dot_has_shadow = fc->GetDrawGlyphShadow();
GlyphID dot_glyph = fc->MapCharToGlyph('.'); GlyphID dot_glyph = fc->MapCharToGlyph('.');
dot_width = fc->GetGlyphWidth(dot_glyph); dot_width = fc->GetGlyphWidth(dot_glyph);
dot_sprite = fc->GetGlyph(dot_glyph); dot_sprite = fc->GetGlyph(dot_glyph);
@@ -612,7 +614,7 @@ static int DrawLayoutLine(const ParagraphLayouter::Line &line, int y, int left,
/* Draw shadow, then foreground */ /* Draw shadow, then foreground */
for (bool do_shadow : { true, false }) { for (bool do_shadow : { true, false }) {
TextColour colour = TC_BLACK; bool colour_has_shadow = false;
for (int run_index = 0; run_index < line.CountRuns(); run_index++) { for (int run_index = 0; run_index < line.CountRuns(); run_index++) {
const ParagraphLayouter::VisualRun &run = line.GetVisualRun(run_index); const ParagraphLayouter::VisualRun &run = line.GetVisualRun(run_index);
const auto &glyphs = run.GetGlyphs(); const auto &glyphs = run.GetGlyphs();
@@ -620,9 +622,10 @@ static int DrawLayoutLine(const ParagraphLayouter::Line &line, int y, int left,
const Font *f = run.GetFont(); const Font *f = run.GetFont();
FontCache *fc = f->fc; FontCache *fc = f->fc;
colour = f->colour; TextColour colour = f->colour;
if (do_shadow && (!fc->GetDrawGlyphShadow() || (colour & TC_NO_SHADE) != 0 || (colour & ~TC_FORCED) == TC_BLACK)) continue; colour_has_shadow = (colour & TC_NO_SHADE) == 0 && colour != TC_BLACK;
ctx.SetColourRemap(do_shadow ? TC_BLACK : colour); ctx.SetColourRemap(do_shadow ? TC_BLACK : colour); // the last run also sets the colour for the truncation dots
if (do_shadow && (!fc->GetDrawGlyphShadow() || !colour_has_shadow)) continue;
DrawPixelInfo *dpi = _cur_dpi; DrawPixelInfo *dpi = _cur_dpi;
int dpi_left = dpi->left; int dpi_left = dpi->left;
@@ -651,7 +654,7 @@ static int DrawLayoutLine(const ParagraphLayouter::Line &line, int y, int left,
} }
} }
if (truncation) { if (truncation && (!do_shadow || (dot_has_shadow && colour_has_shadow))) {
int x = (_current_text_dir == TD_RTL) ? left : (right - 3 * dot_width); int x = (_current_text_dir == TD_RTL) ? left : (right - 3 * dot_width);
for (int i = 0; i < 3; i++, x += dot_width) { for (int i = 0; i < 3; i++, x += dot_width) {
GfxMainBlitter(ctx, dot_sprite, x + (do_shadow ? shadow_offset : 0), y + (do_shadow ? shadow_offset : 0), BM_COLOUR_REMAP); GfxMainBlitter(ctx, dot_sprite, x + (do_shadow ? shadow_offset : 0), y + (do_shadow ? shadow_offset : 0), BM_COLOUR_REMAP);