Merge branch 'master' of github.com:worldbeater/Avalonia

src/Avalonia.Controls/TextBox.cs

@@ -214,9 +214,9 @@ namespace Avalonia.Controls
                 if (!_ignoreTextChanges)
                 {
                     var caretIndex = CaretIndex;
-                    SelectionStart = CoerceCaretIndex(SelectionStart, value?.Length ?? 0);
-                    SelectionEnd = CoerceCaretIndex(SelectionEnd, value?.Length ?? 0);
-                    CaretIndex = CoerceCaretIndex(caretIndex, value?.Length ?? 0);
+                    SelectionStart = CoerceCaretIndex(SelectionStart, value);
+                    SelectionEnd = CoerceCaretIndex(SelectionEnd, value);
+                    CaretIndex = CoerceCaretIndex(caretIndex, value);
 
                     if (SetAndRaise(TextProperty, ref _text, value) && !_isUndoingRedoing)
                     {
@@ -677,11 +677,15 @@ namespace Avalonia.Controls
             }
         }
 
-        private int CoerceCaretIndex(int value) => CoerceCaretIndex(value, Text?.Length ?? 0);
+        private int CoerceCaretIndex(int value) => CoerceCaretIndex(value, Text);
 
-        private int CoerceCaretIndex(int value, int length)
+        private int CoerceCaretIndex(int value, string text)
         {
-            var text = Text;
+            if (text == null)
+            {
+                return 0;
+            }
+            var length = text.Length;
 
             if (value < 0)
             {
@@ -691,7 +695,7 @@ namespace Avalonia.Controls
             {
                 return length;
             }
-            else if (value > 0 && text[value - 1] == '\r' && text[value] == '\n')
+            else if (value > 0 && text[value - 1] == '\r' && value < length && text[value] == '\n')
             {
                 return value + 1;
             }

src/Avalonia.Input/Gestures.cs

@@ -38,7 +38,10 @@ namespace Avalonia.Input
                 }
                 else if (s_lastPress?.IsAlive == true && e.ClickCount == 2 && s_lastPress.Target == e.Source)
                 {
-                    e.Source.RaiseEvent(new RoutedEventArgs(DoubleTappedEvent));
+                    if (!ev.Handled)
+                    {
+                        e.Source.RaiseEvent(new RoutedEventArgs(DoubleTappedEvent));
+                    }
                 }
             }
         }
@@ -51,7 +54,10 @@ namespace Avalonia.Input
 
                 if (s_lastPress?.IsAlive == true && s_lastPress.Target == e.Source)
                 {
-                    ((IInteractive)s_lastPress.Target).RaiseEvent(new RoutedEventArgs(TappedEvent));
+                    if (!ev.Handled)
+                    {
+                        ((IInteractive)s_lastPress.Target).RaiseEvent(new RoutedEventArgs(TappedEvent));
+                    }
                 }
             }
         }

tests/Avalonia.Controls.UnitTests/TextBoxTests.cs

@@ -385,6 +385,21 @@ namespace Avalonia.Controls.UnitTests
                 Assert.True(target.SelectionEnd <= "123".Length);
             }
         }
+        [Fact]
+        public void CoerceCaretIndex_Doesnt_Cause_Exception_with_malformed_line_ending()
+        {
+            using (UnitTestApplication.Start(Services))
+            {
+                var target = new TextBox
+                {
+                    Template = CreateTemplate(),
+                    Text = "0123456789\r"
+                };
+                target.CaretIndex = 11;
+
+                Assert.True(true);
+            }
+        }
 
         private static TestServices Services => TestServices.MockThreadingInterface.With(
             standardCursorFactory: Mock.Of<IStandardCursorFactory>());

tests/Avalonia.Interactivity.UnitTests/GestureTests.cs

@@ -78,5 +78,36 @@ namespace Avalonia.Interactivity.UnitTests
 
             Assert.Equal(new[] { "bp", "dp", "br", "dr", "bt", "dt", "bp", "dp", "bdt", "ddt" }, result);
         }
+
+        [Fact]
+        public void DoubleTapped_Should_Not_Be_Rasied_if_Pressed_is_Handled()
+        {
+            Border border = new Border();
+            var decorator = new Decorator
+            {
+                Child = border
+            };
+            var result = new List<string>();
+
+            decorator.AddHandler(Border.PointerPressedEvent, (s, e) =>
+            {
+                result.Add("dp");
+                e.Handled = true;
+            });
+
+            decorator.AddHandler(Border.PointerReleasedEvent, (s, e) => result.Add("dr"));
+            decorator.AddHandler(Gestures.TappedEvent, (s, e) => result.Add("dt"));
+            decorator.AddHandler(Gestures.DoubleTappedEvent, (s, e) => result.Add("ddt"));
+            border.AddHandler(Border.PointerPressedEvent, (s, e) => result.Add("bp"));
+            border.AddHandler(Border.PointerReleasedEvent, (s, e) => result.Add("br"));
+            border.AddHandler(Gestures.TappedEvent, (s, e) => result.Add("bt"));
+            border.AddHandler(Gestures.DoubleTappedEvent, (s, e) => result.Add("bdt"));
+
+            border.RaiseEvent(new PointerPressedEventArgs());
+            border.RaiseEvent(new PointerReleasedEventArgs());
+            border.RaiseEvent(new PointerPressedEventArgs { ClickCount = 2 });
+
+            Assert.Equal(new[] { "bp", "dp", "br", "dr", "bt", "dt", "bp", "dp" }, result);
+        }
     }
 }