|
|
|
|
@ -833,7 +833,6 @@ namespace ICSharpCode.AvalonEdit.Rendering
@@ -833,7 +833,6 @@ namespace ICSharpCode.AvalonEdit.Rendering
|
|
|
|
|
MeasureInlineObjects(); |
|
|
|
|
|
|
|
|
|
InvalidateVisual(); // = InvalidateArrange+InvalidateRender
|
|
|
|
|
textLayer.InvalidateVisual(); |
|
|
|
|
|
|
|
|
|
double maxWidth; |
|
|
|
|
if (document == null) { |
|
|
|
|
@ -862,6 +861,8 @@ namespace ICSharpCode.AvalonEdit.Rendering
@@ -862,6 +861,8 @@ namespace ICSharpCode.AvalonEdit.Rendering
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
textLayer.SetVisualLines(visibleVisualLines); |
|
|
|
|
|
|
|
|
|
SetScrollData(availableSize, |
|
|
|
|
new Size(maxWidth, heightTreeHeight), |
|
|
|
|
scrollOffset); |
|
|
|
|
@ -1153,14 +1154,13 @@ namespace ICSharpCode.AvalonEdit.Rendering
@@ -1153,14 +1154,13 @@ namespace ICSharpCode.AvalonEdit.Rendering
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
internal void RenderTextLayer(DrawingContext drawingContext) |
|
|
|
|
internal void ArrangeTextLayer(IList<VisualLineDrawingVisual> visuals) |
|
|
|
|
{ |
|
|
|
|
Point pos = new Point(-scrollOffset.X, -clippedPixelsOnTop); |
|
|
|
|
foreach (VisualLine visualLine in allVisualLines) { |
|
|
|
|
foreach (TextLine textLine in visualLine.TextLines) { |
|
|
|
|
textLine.Draw(drawingContext, pos, InvertAxes.None); |
|
|
|
|
pos.Y += textLine.Height; |
|
|
|
|
} |
|
|
|
|
foreach (VisualLineDrawingVisual visual in visuals) { |
|
|
|
|
visual.Transform = new TranslateTransform(pos.X, pos.Y); |
|
|
|
|
visual.Transform.Freeze(); |
|
|
|
|
pos.Y += visual.Height; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
#endregion
|
|
|
|
|
|