cpp/openttd-patchpack/source Changeset - r28784:f88622e76511

Changeset - r28784:f88622e76511

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

frosch - 10 months ago 2024-02-18 15:30:54
frosch@openttd.org

Fix: Shadows of individual character glyphs could be drawn over other characters (#12115)

1 file changed with 8 insertions and 15 deletions:

src/gfx.cpp

0 comments (0 inline, 0 general)

src/gfx.cpp

➞

Show inline comments

@@ @@ -572,30 +572,30 @@ static int DrawLayoutLine(const Paragrap @@
 		default:
 			NOT_REACHED();
+	}
 	const uint shadow_offset = ScaleGUITrad(1);
 	/* Draw shadow, then foreground */
 	for (bool do_shadow : { true, false }) {
 	TextColour colour = TC_BLACK;
 	bool draw_shadow = false;
 	for (int run_index = 0; run_index < line.CountRuns(); run_index++) {
 		const ParagraphLayouter::VisualRun &run = line.GetVisualRun(run_index);
 		const auto &glyphs = run.GetGlyphs();
 		const auto &positions = run.GetPositions();
 		const Font *f = run.GetFont();
 		FontCache *fc = f->fc;
 		colour = f->colour;
 		SetColourRemap(colour);
 			if (do_shadow && (!fc->GetDrawGlyphShadow() || (colour & TC_NO_SHADE) != 0 || colour == TC_BLACK)) continue;
 			SetColourRemap(do_shadow ? TC_BLACK : colour);
 		DrawPixelInfo *dpi = _cur_dpi;
 		int dpi_left  = dpi->left;
 		int dpi_right = dpi->left + dpi->width - 1;
 		draw_shadow = fc->GetDrawGlyphShadow() && (colour & TC_NO_SHADE) == 0 && colour != TC_BLACK;
 		for (int i = 0; i < run.GetGlyphCount(); i++) {
 			GlyphID glyph = glyphs[i];
 			/* Not a valid glyph (empty) */
 			if (glyph == 0xFFFF) continue;
@@ @@ -607,30 +607,23 @@ static int DrawLayoutLine(const Paragrap @@
 			if (truncation && (begin_x < min_x || end_x > max_x)) continue;
 			const Sprite *sprite = fc->GetGlyph(glyph);
 			/* Check clipping (the "+ 1" is for the shadow). */
 			if (begin_x + sprite->x_offs > dpi_right || begin_x + sprite->x_offs + sprite->width /* - 1 + 1 */ < dpi_left) continue;
 			if (draw_shadow && (glyph & SPRITE_GLYPH) == 0) {
 				SetColourRemap(TC_BLACK);
 				GfxMainBlitter(sprite, begin_x + shadow_offset, top + shadow_offset, BM_COLOUR_REMAP);
 				SetColourRemap(colour);
+			}
 			GfxMainBlitter(sprite, begin_x, top, BM_COLOUR_REMAP);
 				if (do_shadow && (glyph & SPRITE_GLYPH) != 0) continue;
 				GfxMainBlitter(sprite, begin_x + (do_shadow ? shadow_offset : 0), top + (do_shadow ? shadow_offset : 0), BM_COLOUR_REMAP);
+		}
+	}
 	if (truncation) {
 		int x = (_current_text_dir == TD_RTL) ? left : (right - 3 * dot_width);
 		for (int i = 0; i < 3; i++, x += dot_width) {
 			if (draw_shadow) {
 				SetColourRemap(TC_BLACK);
 				GfxMainBlitter(dot_sprite, x + shadow_offset, y + shadow_offset, BM_COLOUR_REMAP);
 				SetColourRemap(colour);
 				GfxMainBlitter(dot_sprite, x + (do_shadow ? shadow_offset : 0), y + (do_shadow ? shadow_offset : 0), BM_COLOUR_REMAP);
+			}
 			GfxMainBlitter(dot_sprite, x, y, BM_COLOUR_REMAP);
+		}
+	}
 	if (underline) {
 		GfxFillRect(left, y + h, right, y + h + WidgetDimensions::scaled.bevel.top - 1, _string_colourremap[1]);
+	}

0 comments (0 inline, 0 general)