fix retained glyph bottom clipping

This commit is contained in:
gamer147
2026-07-30 20:29:39 -04:00
parent c9a0869dc8
commit 40da4f029c
9 changed files with 185 additions and 13 deletions

View File

@@ -193,6 +193,40 @@ public class GlyphMaskCompositorTests
Assert.Equal(255, Pixel(destination, 2, 7).A);
}
[Fact]
public void RetainedPresentationCropIncludesInkBelowTheNativeCell()
{
var mask = new GlyphMask(
width: 1, height: 4, stride: 1,
originX: 0, originY: 3,
cellAdvanceX: 4, cellAdvanceY: 0,
cellWidth: 4, cellHeight: 5,
coverage: [16, 16, 16, 16]);
var destination = Image(16, 16);
var engine = new RetainedGlyphLayoutEngine(
new CountingRasterizer(_ => mask));
GlyphTextLayoutResult result = engine.Render(
destination,
new GlyphTextLayoutOptions(
CursorX: 2, CursorY: 1, LineOriginX: 2,
RightBound: 16, BottomBound: 16, WrapHorizontally: true,
Style(renderMode: 3) with
{
EffectOffsetX = 1,
EffectOffsetY = 1,
}),
[NativeRequest(0x82a0, 0x3042)]);
Assert.Equal(
new AdvRetainedGlyphRecord(0, 2, 1, 6, 6),
Assert.Single(result.Records));
Assert.Equal(
new AdvRetainedGlyphPresentationRect(2, 1, 6, 8),
Assert.Single(result.PresentationRects));
Assert.NotEqual(0, Pixel(destination, 2, 7).A);
}
[Fact]
public void ClosingPunctuationStaysOnOverflowingPrecedingLine()
{

View File

@@ -79,6 +79,29 @@ public class RetainedAdvTextLayoutPresentationTests
gfx.SnapshotVisibleObjects().Select(item => (item.DstX, item.DstY)));
}
[Fact]
public void PublicationUsesInkSafeCropWithoutChangingNativeRecord()
{
var presentation = new RetainedAdvTextLayoutPresentation(
new AdvTextLayoutPresentationBinding(
1, 21, 100, 4, -1, 10, 20));
var record = new AdvRetainedGlyphRecord(0, 3, 4, 7, 10);
presentation.Append(
[record],
[new AdvRetainedGlyphPresentationRect(3, 3, 7, 12)],
layoutOriginX: 30,
layoutOriginY: 40);
var gfx = new GfxState();
gfx.CreateSurface(21);
presentation.PublishThrough(gfx, 1);
RenderObject item = Assert.Single(gfx.SnapshotVisibleObjects());
Assert.Equal((3, 3, 4, 9, 33, 43),
(item.SrcX, item.SrcY, item.W, item.H, item.DstX, item.DstY));
Assert.Equal(record, Assert.Single(presentation.Glyphs).Record);
}
[Fact]
public void SavedFrameStyleReconstructionRebuildsTheSameBindings()
{