Merge pull request #5935 from DmitryZhelnin/fixes/5924-copy-from-read…

…only-textbox TextBox: update command states on selection changes
AvaloniaUI · May 19, 2021 · 7efb119 · 7efb119
1 parent 80d3d7f
commit 7efb119
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/Avalonia.Controls/TextBox.cs b/src/Avalonia.Controls/TextBox.cs
@@ -263,7 +263,11 @@ public int SelectionStart
             set
             {
                 value = CoerceCaretIndex(value);
-                SetAndRaise(SelectionStartProperty, ref _selectionStart, value);
+                var changed = SetAndRaise(SelectionStartProperty, ref _selectionStart, value);
+                if (changed)
+                {
+                    UpdateCommandStates();
+                }
                 if (SelectionStart == SelectionEnd)
                 {
                     CaretIndex = SelectionStart;
@@ -281,7 +285,11 @@ public int SelectionEnd
             set
             {
                 value = CoerceCaretIndex(value);
-                SetAndRaise(SelectionEndProperty, ref _selectionEnd, value);
+                var changed = SetAndRaise(SelectionEndProperty, ref _selectionEnd, value);
+                if (changed)
+                {
+                    UpdateCommandStates();
+                }
                 if (SelectionStart == SelectionEnd)
                 {
                     CaretIndex = SelectionEnd;