Fix bug where cut and paste would not correctly work on SplitButtonPa…

…ge and RichEditBoxPage (#294)
microsoft · Dec 12, 2019 · a31f67a · a31f67a
1 parent 2222fff
commit a31f67a
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 1 deletion.
diff --git a/XamlControlsGallery/ControlPages/RichEditBoxPage.xaml.cs b/XamlControlsGallery/ControlPages/RichEditBoxPage.xaml.cs
@@ -28,6 +28,8 @@ public sealed partial class RichEditBoxPage : Page
         // String used to restore the colors when the focus gets reenabled
         // See #144 for more info https://github.com/microsoft/Xaml-Controls-Gallery/issues/144
         private string LastFormattedText = "";
+        private int LastRawTextLength = 0;
+
         public RichEditBoxPage()
         {
             this.InitializeComponent();
@@ -157,6 +159,13 @@ private void FindBoxRemoveHighlights()
 
         private void Editor_GotFocus(object sender, RoutedEventArgs e)
         {
+            editor.Document.GetText(TextGetOptions.UseCrlf, out string currentRawText);
+            if (currentRawText.Length != LastRawTextLength)
+            {
+                // User used cut or paste from action command, skip the event
+                return;
+            }
+
             // reset colors to correct defaults for Focused state
             ITextRange documentRange = editor.Document.GetRange(0, TextConstants.MaxUnitCount);
             SolidColorBrush background = (SolidColorBrush)App.Current.Resources["TextControlBackgroundFocused"];
@@ -189,6 +198,10 @@ private void Editor_GotFocus(object sender, RoutedEventArgs e)
 
         private void Editor_LosingFocus(object sender, RoutedEventArgs e)
         {
+            // Save text length to determine text length change
+            editor.Document.GetText(TextGetOptions.UseCrlf, out string lastRawText);
+            LastRawTextLength = lastRawText.Length; 
+
             editor.Document.GetText(TextGetOptions.FormatRtf, out LastFormattedText);
         }
 

diff --git a/XamlControlsGallery/ControlPages/SplitButtonPage.xaml.cs b/XamlControlsGallery/ControlPages/SplitButtonPage.xaml.cs
@@ -15,6 +15,8 @@ public sealed partial class SplitButtonPage : Page
         // (which also applies to this RichEditBox)
         private string LastFormattedText = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, " +
                 "sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Tempor commodo ullamcorper a lacus.";
+        private int LastRawTextLength = 0;
+
         public SplitButtonPage()
         {
             this.InitializeComponent();
@@ -38,7 +40,7 @@ private void ColorButton_Click(object sender, RoutedEventArgs e)
             currentColor = color;
         }
 
-        private void RevealColorButton_Click(object sender,RoutedEventArgs e)
+        private void RevealColorButton_Click(object sender, RoutedEventArgs e)
         {
             myColorButtonReveal.Flyout.Hide();
         }
@@ -65,6 +67,12 @@ private void MyRichEditBox_TextChanging(object sender, RichEditBoxTextChangingEv
 
         private void MyRichEditBox_GotFocus(object sender, RoutedEventArgs e)
         {
+            myRichEditBox.Document.GetText(TextGetOptions.UseCrlf, out string currentRawText);
+            if (currentRawText.Length != LastRawTextLength)
+            {
+                // User used cut or paste from action command, skip the event
+                return;
+            }
             // reset colors to correct defaults for Focused state
             ITextRange documentRange = myRichEditBox.Document.GetRange(0, TextConstants.MaxUnitCount);
             SolidColorBrush background = (SolidColorBrush)App.Current.Resources["TextControlBackgroundFocused"];
@@ -97,6 +105,11 @@ private void MyRichEditBox_GotFocus(object sender, RoutedEventArgs e)
 
         private void MyRichEditBox_LosingFocus(object sender, RoutedEventArgs e)
         {
+            // Save text length to determine text length change
+            myRichEditBox.Document.GetText(TextGetOptions.UseCrlf, out string lastRawText);
+            LastRawTextLength = lastRawText.Length;
+
+            // Save formatted to restore formatting upon regaining focus
             myRichEditBox.Document.GetText(TextGetOptions.FormatRtf, out LastFormattedText);
         }
     }

diff --git a/XamlControlsGallery/ControlPagesSampleCode/Text/RichEditBox/RichEditBoxSample3_cs.txt b/XamlControlsGallery/ControlPagesSampleCode/Text/RichEditBox/RichEditBoxSample3_cs.txt
@@ -1,5 +1,6 @@
 private Color currentColor = Colors.Black;
 private string LastFormattedText = "";
+private int LastRawTextLength = 0;
 
 private async void OpenButton_Click(object sender, RoutedEventArgs e)
 {
@@ -114,6 +115,12 @@ private void FindBoxRemoveHighlights()
 
 private void Editor_GotFocus(object sender, RoutedEventArgs e)
 {
+    editor.Document.GetText(TextGetOptions.UseCrlf, out string currentRawText);
+    if (currentRawText.Length != LastRawTextLength)
+    {
+        // User used cut or paste from action command, skip the event
+        return;
+    }
     // reset colors to correct defaults for Focused state
     ITextRange documentRange = editor.Document.GetRange(0, TextConstants.MaxUnitCount);
     SolidColorBrush background = (SolidColorBrush)App.Current.Resources["TextControlBackgroundFocused"];
@@ -145,6 +152,11 @@ private void Editor_GotFocus(object sender, RoutedEventArgs e)
 
 private void Editor_LosingFocus(object sender, RoutedEventArgs e)
 {
+    // Save text length to determine text length change
+    editor.Document.GetText(TextGetOptions.UseCrlf, out string lastRawText);
+    LastRawTextLength = lastRawText.Length; 
+
+    // Save formatted to restore formatting upon regaining focus
     editor.Document.GetText(TextGetOptions.FormatRtf, out LastFormattedText);
 }