Skip to content

Commit c2b5d46

Browse files
emmaussemmauss
committed
add touch tests textbox
1 parent 2c81338 commit c2b5d46

4 files changed

Lines changed: 332 additions & 45 deletions

File tree

‎src/Avalonia.Controls/TextBox.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1688,10 +1688,10 @@ protected override void OnHolding(HoldingRoutedEventArgs e)
16881688
if (text != null)
16891689
{
16901690
var position = e.PointerEventArgs.GetPosition(_presenter);
1691-
_presenter.MoveCaretToPoint(position);
1692-
var caretIndex = _presenter.CaretIndex;
16931691
var selectionStart = SelectionStart;
16941692
var selectionEnd = SelectionEnd;
1693+
_presenter.MoveCaretToPoint(position);
1694+
var caretIndex = _presenter.CaretIndex;
16951695
var isInSelection = selectionStart != selectionEnd &&
16961696
caretIndex >= selectionStart && caretIndex <= selectionEnd;
16971697

@@ -2054,8 +2054,6 @@ protected override void OnPointerReleased(PointerReleasedEventArgs e)
20542054
_isInTouchSelectionMode = false;
20552055
_isInTouchCaretMode = false;
20562056
_hasTouchSelection = false;
2057-
2058-
e.Pointer.Capture(null);
20592057
}
20602058

20612059
protected override AutomationPeer OnCreateAutomationPeer()

‎tests/Avalonia.Controls.UnitTests/TextBoxTests.cs‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1537,11 +1537,11 @@ public void Should_Move_Caret_To_EndOfLine()
15371537
}
15381538

15391539
[Theory]
1540-
[InlineData(2,4)]
1541-
[InlineData(0,4)]
1542-
[InlineData(2,6)]
1543-
[InlineData(0,6)]
1544-
[InlineData(3,4)]
1540+
[InlineData(2, 4)]
1541+
[InlineData(0, 4)]
1542+
[InlineData(2, 6)]
1543+
[InlineData(0, 6)]
1544+
[InlineData(3, 4)]
15451545
public void When_Selection_From_Left_To_Right_Pressing_Right_Should_Remove_Selection_Moving_Caret_To_End_Of_Previous_Selection(int selectionStart, int selectionEnd)
15461546
{
15471547
using (UnitTestApplication.Start(Services))
@@ -1566,11 +1566,11 @@ public void When_Selection_From_Left_To_Right_Pressing_Right_Should_Remove_Selec
15661566
}
15671567

15681568
[Theory]
1569-
[InlineData(2,4)]
1570-
[InlineData(0,4)]
1571-
[InlineData(2,6)]
1572-
[InlineData(0,6)]
1573-
[InlineData(3,4)]
1569+
[InlineData(2, 4)]
1570+
[InlineData(0, 4)]
1571+
[InlineData(2, 6)]
1572+
[InlineData(0, 6)]
1573+
[InlineData(3, 4)]
15741574
public void When_Selection_From_Left_To_Right_Pressing_Left_Should_Remove_Selection_Moving_Caret_To_Start_Of_Previous_Selection(int selectionStart, int selectionEnd)
15751575
{
15761576
using (UnitTestApplication.Start(Services))
@@ -1595,11 +1595,11 @@ public void When_Selection_From_Left_To_Right_Pressing_Left_Should_Remove_Select
15951595
}
15961596

15971597
[Theory]
1598-
[InlineData(4,2)]
1599-
[InlineData(4,0)]
1600-
[InlineData(6,2)]
1601-
[InlineData(6,0)]
1602-
[InlineData(4,3)]
1598+
[InlineData(4, 2)]
1599+
[InlineData(4, 0)]
1600+
[InlineData(6, 2)]
1601+
[InlineData(6, 0)]
1602+
[InlineData(4, 3)]
16031603
public void When_Selection_From_Right_To_Left_Pressing_Right_Should_Remove_Selection_Moving_Caret_To_Start_Of_Previous_Selection(int selectionStart, int selectionEnd)
16041604
{
16051605
using (UnitTestApplication.Start(Services))
@@ -1624,11 +1624,11 @@ public void When_Selection_From_Right_To_Left_Pressing_Right_Should_Remove_Selec
16241624
}
16251625

16261626
[Theory]
1627-
[InlineData(4,2)]
1628-
[InlineData(4,0)]
1629-
[InlineData(6,2)]
1630-
[InlineData(6,0)]
1631-
[InlineData(4,3)]
1627+
[InlineData(4, 2)]
1628+
[InlineData(4, 0)]
1629+
[InlineData(6, 2)]
1630+
[InlineData(6, 0)]
1631+
[InlineData(4, 3)]
16321632
public void When_Selection_From_Right_To_Left_Pressing_Left_Should_Remove_Selection_Moving_Caret_To_End_Of_Previous_Selection(int selectionStart, int selectionEnd)
16331633
{
16341634
using (UnitTestApplication.Start(Services))
@@ -1707,11 +1707,11 @@ public void When_Select_All_From_Position_Right_Should_Remove_Selection_Moving_C
17071707
}
17081708

17091709
[Theory]
1710-
[InlineData(2,4)]
1711-
[InlineData(0,4)]
1712-
[InlineData(2,6)]
1713-
[InlineData(0,6)]
1714-
[InlineData(3,4)]
1710+
[InlineData(2, 4)]
1711+
[InlineData(0, 4)]
1712+
[InlineData(2, 6)]
1713+
[InlineData(0, 6)]
1714+
[InlineData(3, 4)]
17151715
public void When_Selection_From_Left_To_Right_Pressing_Up_Should_Remove_Selection_Moving_Caret_To_Start_Of_Previous_Selection(int selectionStart, int selectionEnd)
17161716
{
17171717
using (UnitTestApplication.Start(Services))
@@ -1736,11 +1736,11 @@ public void When_Selection_From_Left_To_Right_Pressing_Up_Should_Remove_Selectio
17361736
}
17371737

17381738
[Theory]
1739-
[InlineData(4,2)]
1740-
[InlineData(4,0)]
1741-
[InlineData(6,2)]
1742-
[InlineData(6,0)]
1743-
[InlineData(4,3)]
1739+
[InlineData(4, 2)]
1740+
[InlineData(4, 0)]
1741+
[InlineData(6, 2)]
1742+
[InlineData(6, 0)]
1743+
[InlineData(4, 3)]
17441744
public void When_Selection_From_Right_To_Left_Pressing_Up_Should_Remove_Selection_Moving_Caret_To_End_Of_Previous_Selection(int selectionStart, int selectionEnd)
17451745
{
17461746
using (UnitTestApplication.Start(Services))
@@ -1792,11 +1792,11 @@ public void When_Select_All_From_Position_Up_Should_Remove_Selection_Moving_Care
17921792
}
17931793

17941794
[Theory]
1795-
[InlineData(2,4)]
1796-
[InlineData(0,4)]
1797-
[InlineData(2,6)]
1798-
[InlineData(0,6)]
1799-
[InlineData(3,4)]
1795+
[InlineData(2, 4)]
1796+
[InlineData(0, 4)]
1797+
[InlineData(2, 6)]
1798+
[InlineData(0, 6)]
1799+
[InlineData(3, 4)]
18001800
public void When_Selection_From_Left_To_Right_Pressing_Down_Should_Remove_Selection_Moving_Caret_To_End_Of_Previous_Selection(int selectionStart, int selectionEnd)
18011801
{
18021802
using (UnitTestApplication.Start(Services))
@@ -1821,11 +1821,11 @@ public void When_Selection_From_Left_To_Right_Pressing_Down_Should_Remove_Select
18211821
}
18221822

18231823
[Theory]
1824-
[InlineData(4,2)]
1825-
[InlineData(4,0)]
1826-
[InlineData(6,2)]
1827-
[InlineData(6,0)]
1828-
[InlineData(4,3)]
1824+
[InlineData(4, 2)]
1825+
[InlineData(4, 0)]
1826+
[InlineData(6, 2)]
1827+
[InlineData(6, 0)]
1828+
[InlineData(4, 3)]
18291829
public void When_Selection_From_Right_To_Left_Pressing_Down_Should_Remove_Selection_Moving_Caret_To_Start_Of_Previous_Selection(int selectionStart, int selectionEnd)
18301830
{
18311831
using (UnitTestApplication.Start(Services))

0 commit comments

Comments
 (0)