From 9b385c588b7deab845f759fb8be6357375be6574 Mon Sep 17 00:00:00 2001
From: zekiahepic <73035340+Zekiah-A@users.noreply.github.com>
Date: Thu, 12 Aug 2021 00:37:05 +0100
Subject: [PATCH 1/2] Update EditableTextBlock.cs

Updated obsolete code
---
 .../Controls/EditableTextBlock.cs                    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/AvalonStudio.Shell.Extensibility/Controls/EditableTextBlock.cs b/src/AvalonStudio.Shell.Extensibility/Controls/EditableTextBlock.cs
index 264f7aa..af1e78a 100644
--- a/src/AvalonStudio.Shell.Extensibility/Controls/EditableTextBlock.cs
+++ b/src/AvalonStudio.Shell.Extensibility/Controls/EditableTextBlock.cs
@@ -1,4 +1,4 @@
-using Avalonia;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
 using Avalonia.Data;
@@ -53,15 +53,15 @@ public EditableTextBlock()
 
                 if (!InEditMode)
                 {
-                    var properties = e.GetPointerPoint(this).Properties;
+                    var properties = e.GetCurrentPoint(this).Properties;
                     if (e.ClickCount == 1 && properties.IsLeftButtonPressed && IsFocused)
                     {
                         _editClickTimer.Start();
-                    }
+                   }
                 }
                 else
                 {
-                    var hit = this.InputHitTest(e.GetPosition(this));
+                   var hit = this.InputHitTest(e.GetPosition(this));
 
                     if (hit == null)
                     {
@@ -142,7 +142,7 @@ private void EnterEditMode()
         {
             EditText = Text;
             InEditMode = true;
-            (VisualRoot as IInputRoot).MouseDevice.Capture(_textBox);
+            (VisualRoot as IPointer).Capture(null);
             _textBox.CaretIndex = Text.Length;
             _textBox.SelectionStart = 0;
             _textBox.SelectionEnd = Text.Length;
@@ -165,7 +165,7 @@ private void ExitEditMode(bool restore = false)
             }
 
             InEditMode = false;
-            (VisualRoot as IInputRoot).MouseDevice.Capture(null);
+            (VisualRoot as IPointer).Capture(null);
         }
 
         protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)

From ab0f4945761096da938db3acac30a8cb281b7cd7 Mon Sep 17 00:00:00 2001
From: zekiahepic <73035340+Zekiah-A@users.noreply.github.com>
Date: Thu, 12 Aug 2021 01:33:48 +0100
Subject: [PATCH 2/2] Update EditableTextBlock.cs

undid some changes that seemed to break it
---
 .../Controls/EditableTextBlock.cs                         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/AvalonStudio.Shell.Extensibility/Controls/EditableTextBlock.cs b/src/AvalonStudio.Shell.Extensibility/Controls/EditableTextBlock.cs
index af1e78a..6c5bc74 100644
--- a/src/AvalonStudio.Shell.Extensibility/Controls/EditableTextBlock.cs
+++ b/src/AvalonStudio.Shell.Extensibility/Controls/EditableTextBlock.cs
@@ -57,11 +57,11 @@ public EditableTextBlock()
                     if (e.ClickCount == 1 && properties.IsLeftButtonPressed && IsFocused)
                     {
                         _editClickTimer.Start();
-                   }
+                    }
                 }
                 else
                 {
-                   var hit = this.InputHitTest(e.GetPosition(this));
+                    var hit = this.InputHitTest(e.GetPosition(this));
 
                     if (hit == null)
                     {
@@ -142,7 +142,7 @@ private void EnterEditMode()
         {
             EditText = Text;
             InEditMode = true;
-            (VisualRoot as IPointer).Capture(null);
+            (VisualRoot as IInputRoot).MouseDevice.Capture(_textBox);
             _textBox.CaretIndex = Text.Length;
             _textBox.SelectionStart = 0;
             _textBox.SelectionEnd = Text.Length;
@@ -165,7 +165,7 @@ private void ExitEditMode(bool restore = false)
             }
 
             InEditMode = false;
-            (VisualRoot as IPointer).Capture(null);
+            (VisualRoot as IInputRoot).MouseDevice.Capture(null);
         }
 
         protected override void OnPropertyChanged<T>(AvaloniaPropertyChangedEventArgs<T> change)