Merge branch 'master' into master

BAndysc · Jul 21, 2021 · 4964991 · 4964991
2 parents 8165888 + 5245375
commit 4964991
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/AvaloniaEdit/Rendering/TextView.cs b/src/AvaloniaEdit/Rendering/TextView.cs
@@ -970,6 +970,10 @@ protected override Size MeasureOverride(Size availableSize)
 
             TextLayer.SetVisualLines(_visibleVisualLines);
 
+            SetScrollData(availableSize,
+                          new Size(maxWidth, heightTreeHeight),
+                          _scrollOffset);
+
             // Size of control (scorll viewport) might be changed during ArrageOverride. We only need document size for now.
             _documentSize = new Size(maxWidth, heightTreeHeight);
 

diff --git a/src/AvaloniaEdit/TextEditorOptions.cs b/src/AvaloniaEdit/TextEditorOptions.cs
@@ -325,7 +325,7 @@ public virtual bool CutCopyWholeLine
 
         /// <summary>
         /// Gets/Sets whether the user can scroll below the bottom of the document.
-        /// The default value is false; but it a good idea to set this property to true when using folding.
+        /// The default value is true; but it a good idea to set this property to true when using folding.
         /// </summary>
         [DefaultValue(true)]
         public virtual bool AllowScrollBelowDocument