From 086e15cc9a22698c2a04721bb56b00983301b00e Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sat, 1 Oct 2011 20:37:10 +0200 Subject: [PATCH] Fix reported TextView size when word-wrap is enabled and a word-wrap position is within a space character. --- .../ICSharpCode.AvalonEdit/Rendering/TextView.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/TextView.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/TextView.cs index 6464903978..5a81b6717f 100644 --- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/TextView.cs +++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Rendering/TextView.cs @@ -869,10 +869,7 @@ namespace ICSharpCode.AvalonEdit.Rendering if (VisualLinesChanged != null) VisualLinesChanged(this, EventArgs.Empty); - return new Size( - canHorizontallyScroll ? Math.Min(availableSize.Width, maxWidth) : maxWidth, - canVerticallyScroll ? Math.Min(availableSize.Height, heightTreeHeight) : heightTreeHeight - ); + return new Size(Math.Min(availableSize.Width, maxWidth), Math.Min(availableSize.Height, heightTreeHeight)); } /// @@ -1278,6 +1275,11 @@ namespace ICSharpCode.AvalonEdit.Rendering void SetScrollOffset(Vector vector) { + if (!canHorizontallyScroll) + vector.X = 0; + if (!canVerticallyScroll) + vector.Y = 0; + if (!scrollOffset.IsClose(vector)) { scrollOffset = vector; if (ScrollOffsetChanged != null)