Fix textbox cut command (#458)

* Fix MenuFlyoutItem Disable the cut command for readonly textbox. * Added post-processing for text cut command. * Evaluates the RichEditBox.IsReadOnly state second. * Modified the order of conditional expressions.
DevToys-app · Mar 26, 2022 · 3e8b744 · 3e8b744
1 parent f156131
commit 3e8b744
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml.cs b/src/dev/impl/DevToys/UI/Controls/CustomTextBox.xaml.cs
@@ -139,7 +139,11 @@ public CustomTextBox()
 
         private bool CanExecuteCutCommand()
         {
-            return RichEditBox != null && RichEditBox.TextDocument.Selection.Length != 0 && IsEnabled && RichEditBox.TextDocument.CanCopy();
+            return IsEnabled
+                   && !IsReadOnly
+                   && RichEditBox != null
+                   && RichEditBox.TextDocument.Selection.Length != 0
+                   && RichEditBox.TextDocument.CanCopy();
         }
 
         private void ExecuteCutCommand()
@@ -203,7 +207,10 @@ private void ExecutePasteCommand()
 
         private bool CanExecuteDeleteCommand()
         {
-            return RichEditBox != null && RichEditBox.TextDocument.Selection.Length != 0 && IsEnabled && !IsReadOnly;
+            return  IsEnabled
+                    && !IsReadOnly
+                    && RichEditBox != null
+                    && RichEditBox.TextDocument.Selection.Length != 0;
         }
 
         private void ExecuteDeleteCommand()
@@ -649,6 +656,7 @@ private void TextBox_CopyingToClipboard(TextBox sender, TextControlCopyingToClip
         private void TextBox_CuttingToClipboard(TextBox sender, TextControlCuttingToClipboardEventArgs args)
         {
             CopyTextBoxSelectionToClipboard();
+            sender.SelectedText = string.Empty;
             args.Handled = true;
         }
 
@@ -666,6 +674,7 @@ private void RichEditBox_CopyingToClipboard(RichEditBox sender, TextControlCopyi
         private void RichEditBox_CuttingToClipboard(RichEditBox sender, TextControlCuttingToClipboardEventArgs args)
         {
             CopyRichEditBoxSelectionToClipboard();
+            sender.TextDocument.Selection.Text = string.Empty;
             args.Handled = true;
         }