Avalonia

Branch: main

Commit Graph

Author	SHA1	Message	Date
Benedikt Stebner	888f7557bd	Rebuild TextBlock text runs only when the content changes (#22149 ) * Keep TextBlock text runs in sync with its inlines _textRuns is built from Inlines, but OnMeasureInvalidated discarded it on any measure invalidation while Inlines still held the content. Between that point and the next measure pass, CreateTextLayout read a null _textRuns as "no inlines" and shaped Text instead, which is null whenever the content lives in Inlines. That empty result went into the TextRunCache, keyed by text source index, so every later layout reused it and the control rendered nothing until something invalidated the cache. - Discard _textRuns in InvalidateTextLayout, next to the run cache, so the runs and the cache are dropped by the same event and cannot disagree about the content. - Build the runs on demand in EnsureTextRuns, and pick the text source by HasComplexContent rather than by _textRuns being set. - Split the constraint-dependent work out of run building. Runs answer to the content alone; only an embedded control answers to the available width, so Inline.MeasureEmbeddedControls measures it and EmbeddedControlRun reports the child's DesiredSize live. Runs now survive a constraint change instead of being rebuilt every measure. SelectableTextBlock never hands the run cache to its layout, but it shared the same fallback and kept the wrong layout on _textLayout. Fixes #21902 Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * Invalidate the layout when LineSpacing changes LineSpacing had no case in the property change switch and is not one of the properties registered with AffectsRender, so changing it left the measured size and the rendered text untouched even though CreateTextLayout feeds it into the paragraph properties. It changes line placement rather than shaping, so it belongs with LineHeight and the other properties that keep the run cache. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * Drop the text layout whenever the content is invalidated InvalidateMeasure only raises OnMeasureInvalidated while the measure is still valid, so a second content change before the next measure pass left _textLayout holding the layout the first change had already replaced. MeasureOverride keeps that layout when the constraint has not moved, so the block measured and rendered the superseded content. Clear the layout in InvalidateTextLayout and InvalidateTextLayoutKeepCache rather than relying on OnMeasureInvalidated to run, which is what TextPresenter already does. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * Drop the text layout when an embedded control resizes A line snapshots its metrics when it is formatted, so a layout built before a child was measured again keeps reporting the width and height that child used to have. MeasureOverride reuses the layout whenever the constraint has not moved, so a control that resizes while the block is already measure invalid never reaches the measured size. - MeasureEmbeddedControls reports whether any child came back a different size, and the layout is dropped only then rather than on every pass. - Route the remaining layout resets through DisposeTextLayout so every reset goes through one place. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5 <noreply@anthropic.com>	1 week ago
Julien Lebosquain	960cb39414	Enable nullability in Controls.UnitTests (#20373 )	9 months ago
Benedikt Stebner	62054dbcc1	Make sure inlines properly inherit text run properties from their parent (#19750 ) * Make sure inlines properly inherit text run properties from their parent * Adjust comment	12 months ago

Author

SHA1

Message

Date

Benedikt Stebner

888f7557bd

Rebuild TextBlock text runs only when the content changes (#22149 )

* Keep TextBlock text runs in sync with its inlines

_textRuns is built from Inlines, but OnMeasureInvalidated discarded it on
any measure invalidation while Inlines still held the content. Between
that point and the next measure pass, CreateTextLayout read a null
_textRuns as "no inlines" and shaped Text instead, which is null whenever
the content lives in Inlines. That empty result went into the
TextRunCache, keyed by text source index, so every later layout reused it
and the control rendered nothing until something invalidated the cache.

- Discard _textRuns in InvalidateTextLayout, next to the run cache, so
  the runs and the cache are dropped by the same event and cannot
  disagree about the content.
- Build the runs on demand in EnsureTextRuns, and pick the text source by
  HasComplexContent rather than by _textRuns being set.
- Split the constraint-dependent work out of run building. Runs answer to
  the content alone; only an embedded control answers to the available
  width, so Inline.MeasureEmbeddedControls measures it and
  EmbeddedControlRun reports the child's DesiredSize live. Runs now
  survive a constraint change instead of being rebuilt every measure.

SelectableTextBlock never hands the run cache to its layout, but it
shared the same fallback and kept the wrong layout on _textLayout.

Fixes #21902

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

* Invalidate the layout when LineSpacing changes

LineSpacing had no case in the property change switch and is not one of
the properties registered with AffectsRender, so changing it left the
measured size and the rendered text untouched even though CreateTextLayout
feeds it into the paragraph properties. It changes line placement rather
than shaping, so it belongs with LineHeight and the other properties that
keep the run cache.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

* Drop the text layout whenever the content is invalidated

InvalidateMeasure only raises OnMeasureInvalidated while the measure is
still valid, so a second content change before the next measure pass left
_textLayout holding the layout the first change had already replaced.
MeasureOverride keeps that layout when the constraint has not moved, so
the block measured and rendered the superseded content.

Clear the layout in InvalidateTextLayout and InvalidateTextLayoutKeepCache
rather than relying on OnMeasureInvalidated to run, which is what
TextPresenter already does.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

* Drop the text layout when an embedded control resizes

A line snapshots its metrics when it is formatted, so a layout built
before a child was measured again keeps reporting the width and height
that child used to have. MeasureOverride reuses the layout whenever the
constraint has not moved, so a control that resizes while the block is
already measure invalid never reaches the measured size.

- MeasureEmbeddedControls reports whether any child came back a different
  size, and the layout is dropped only then rather than on every pass.
- Route the remaining layout resets through DisposeTextLayout so every
  reset goes through one place.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 5 <noreply@anthropic.com>

1 week ago

Julien Lebosquain

960cb39414

Enable nullability in Controls.UnitTests (#20373 )

9 months ago

Benedikt Stebner

62054dbcc1

Make sure inlines properly inherit text run properties from their parent (#19750 )

* Make sure inlines properly inherit text run properties from their parent

* Adjust comment

12 months ago

3 Commits (main)