From 3f014385939c531b9e4c72b4a6d6a7a28aaea749 Mon Sep 17 00:00:00 2001
From: Benedikt Stebner <b.stebner@outlook.de>
Date: Fri, 23 Apr 2021 13:55:13 +0200
Subject: [PATCH] Fix TextWrapping for AcceptsReturn = false

---
 src/Avalonia.Controls/TextBox.cs | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
index 158f3ac886..69da667011 100644
--- a/src/Avalonia.Controls/TextBox.cs
+++ b/src/Avalonia.Controls/TextBox.cs
@@ -175,16 +175,12 @@ namespace Avalonia.Controls
                 this.GetObservable(TextWrappingProperty),
                 (acceptsReturn, wrapping) =>
                 {
-                    if (acceptsReturn)
+                    if (wrapping != TextWrapping.NoWrap)
                     {
-                        return wrapping != TextWrapping.Wrap ?
-                            ScrollBarVisibility.Auto :
-                            ScrollBarVisibility.Disabled;
-                    }
-                    else
-                    {
-                        return ScrollBarVisibility.Hidden;
+                        return ScrollBarVisibility.Disabled;
                     }
+
+                    return acceptsReturn ? ScrollBarVisibility.Auto : ScrollBarVisibility.Hidden;
                 });
             this.Bind(
                 ScrollViewer.HorizontalScrollBarVisibilityProperty,