ScratchPadPage.xaml was broken, Grid was blocked (#1759)

Jay-o-Way · niels9001 · web-flow · commit 4d28fe26c420 · 2025-02-13T08:45:29.000+01:00
## Description

I noticed that the interactive area of the page did not receive any
mouse input. Keyboard did work. I saw that conversion for
`RowDefinitions="*, Auto"` was applied to the incorrect (child) Grid,
causing the TextBlock to be in the same Grid cell as the RichInput.

## Motivation and Context

Fix blocked input

## How Has This Been Tested?

## Types of changes

- [x] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality to change)

---------

Co-authored-by: Niels Laute &lt;niels.laute@live.nl&gt;
diff --git a/WinUIGallery/Samples/ControlPages/XamlFundamentals/ScratchPadPage.xaml b/WinUIGallery/Samples/ControlPages/XamlFundamentals/ScratchPadPage.xaml
@@ -10,7 +10,7 @@
         Margin="0,12,0,0"
         BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
         BorderThickness="1"
-        CornerRadius="8">
+        CornerRadius="{StaticResource OverlayCornerRadius}">
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />
             <RowDefinition Height="*" />
@@ -30,49 +30,52 @@
             Background="{ThemeResource ExpanderContentBackground}"
             BorderBrush="{ThemeResource DividerStrokeColorDefaultBrush}"
             BorderThickness="0,1,0,0"
-            CornerRadius="{ThemeResource ControlCornerRadius}">
-            <Grid ColumnSpacing="12" RowSpacing="8">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="Auto" MinWidth="168" />
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="*" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-                <RichEditBox
-                    x:Name="textbox"
-                    AcceptsReturn="True"
-                    ActualThemeChanged="textbox_ActualThemeChanged"
-                    AutomationProperties.Name="XAML markup textbox"
-                    FontFamily="Consolas"
-                    FontSize="12"
-                    IsSpellCheckEnabled="False"
-                    KeyDown="textbox_KeyDown"
-                    PreviewKeyDown="textbox_PreviewKeyDown"
-                    PreviewKeyUp="textbox_PreviewKeyUp"
-                    ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                    ScrollViewer.VerticalScrollBarVisibility="Auto"
-                    TextChanged="textbox_TextChanged" />
-                <StackPanel
-                    Grid.Column="1"
+            ColumnSpacing="12"
+            RowSpacing="8">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" MinWidth="168" />
+            </Grid.ColumnDefinitions>
+
+            <RichEditBox
+                x:Name="textbox"
+                AcceptsReturn="True"
+                ActualThemeChanged="textbox_ActualThemeChanged"
+                AutomationProperties.Name="XAML markup textbox"
+                FontFamily="Consolas"
+                FontSize="12"
+                IsSpellCheckEnabled="False"
+                KeyDown="textbox_KeyDown"
+                PreviewKeyDown="textbox_PreviewKeyDown"
+                PreviewKeyUp="textbox_PreviewKeyUp"
+                ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                ScrollViewer.VerticalScrollBarVisibility="Auto"
+                TextChanged="textbox_TextChanged" />
+            <StackPanel
+                Grid.Column="1"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Top"
+                Spacing="8">
+                <Button
+                    x:Name="loadButton"
+                    HorizontalAlignment="Stretch"
+                    Click="LoadClick"
+                    Content="Load"
+                    Style="{StaticResource AccentButtonStyle}" />
+                <Button
                     HorizontalAlignment="Stretch"
-                    VerticalAlignment="Top"
-                    Spacing="12">
-                    <Button
-                        x:Name="loadButton"
-                        HorizontalAlignment="Stretch"
-                        Click="LoadClick"
-                        Content="Load"
-                        Style="{StaticResource AccentButtonStyle}" />
-                    <Button
-                        HorizontalAlignment="Stretch"
-                        Click="ResetToDefaultClick"
-                        Content="Reset"
-                        ToolTipService.ToolTip="Resets to the default scratch pad content" />
-                </StackPanel>
-            </Grid>
-            <TextBlock x:Name="loadStatus" Grid.Row="1" />
+                    Click="ResetToDefaultClick"
+                    Content="Reset"
+                    ToolTipService.ToolTip="Resets to the default scratch pad content" />
+            </StackPanel>
+            <TextBlock
+                x:Name="loadStatus"
+                Grid.Row="1"
+                Grid.ColumnSpan="2" />
         </Grid>
     </Grid>
 </Page>
diff --git a/WinUIGallery/Samples/ControlPages/XamlFundamentals/ScratchPadPage.xaml.cs b/WinUIGallery/Samples/ControlPages/XamlFundamentals/ScratchPadPage.xaml.cs
@@ -1,11 +1,13 @@
 using System;
 using System.Linq;
 using Microsoft.UI.Input;
+using Microsoft.UI.Text;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Markup;
 using Windows.Storage;
+using Windows.System;
 
 namespace WinUIGallery.ControlPages;
 
@@ -24,7 +26,7 @@ public ScratchPadPage()
         }
 
         m_oldText = xamlStr;
-        textbox.TextDocument.SetText(Microsoft.UI.Text.TextSetOptions.None, m_oldText);
+        textbox.TextDocument.SetText(TextSetOptions.None, m_oldText);
         var formatter = new XamlTextFormatter(textbox);
         formatter.ApplyColors();
 
@@ -57,10 +59,10 @@ private string GetDefaultScratchXAML()
 
     public string ReadScratchPadXAMLinLocalSettings()
     {
-        var appData = Windows.Storage.ApplicationData.Current;
+        var appData = ApplicationData.Current;
         if (appData.LocalSettings.Containers.ContainsKey("ScratchPad"))
         {
-            var scratchPadContainer = appData.LocalSettings.CreateContainer("ScratchPad", Windows.Storage.ApplicationDataCreateDisposition.Existing);
+            var scratchPadContainer = appData.LocalSettings.CreateContainer("ScratchPad", ApplicationDataCreateDisposition.Existing);
             if (scratchPadContainer != null && scratchPadContainer.Values.ContainsKey("ScratchPadXAML"))
             {
                 // String values are limited to 4K characters. Use a composite value to support a longer string.
@@ -79,8 +81,8 @@ public string ReadScratchPadXAMLinLocalSettings()
 
     public void SaveScratchPadXAMLinLocalSettings(string xamlStr)
     {
-        var appData = Windows.Storage.ApplicationData.Current;
-        var scratchPadContainer = appData.LocalSettings.CreateContainer("ScratchPad", Windows.Storage.ApplicationDataCreateDisposition.Always);
+        var appData = ApplicationData.Current;
+        var scratchPadContainer = appData.LocalSettings.CreateContainer("ScratchPad", ApplicationDataCreateDisposition.Always);
         // String values are limited to 4K characters. Use a composite value to support a longer string.
         var compositeStr = new ApplicationDataCompositeValue();
         int count = 0;
@@ -109,7 +111,7 @@ private async void ResetToDefaultClick(object sender, RoutedEventArgs e)
         if (result == ContentDialogResult.Primary)
         {
             m_oldText = GetDefaultScratchXAML();
-            textbox.TextDocument.SetText(Microsoft.UI.Text.TextSetOptions.None, m_oldText);
+            textbox.TextDocument.SetText(TextSetOptions.None, m_oldText);
             var formatter = new XamlTextFormatter(textbox);
             formatter.ApplyColors();
 
@@ -136,7 +138,7 @@ private string AddXmlNamespace(string xml)
     private void LoadContent()
     {
         string newText;
-        textbox.TextDocument.GetText(Microsoft.UI.Text.TextGetOptions.None, out newText);
+        textbox.TextDocument.GetText(TextGetOptions.None, out newText);
         //System.Diagnostics.Debug.WriteLine("new text: " + newText);
 
         SaveScratchPadXAMLinLocalSettings(newText);
@@ -180,7 +182,7 @@ private void InsertTextboxText(string str, bool setCursorAfterInsertedStr)
     private string GetTextboxTextPreviousLine()
     {
         string newText;
-        textbox.TextDocument.GetText(Microsoft.UI.Text.TextGetOptions.None, out newText);
+        textbox.TextDocument.GetText(TextGetOptions.None, out newText);
         var selectionIndex = textbox.TextDocument.Selection.StartPosition;
         if (selectionIndex > 0)
         {
@@ -230,7 +232,7 @@ private void textbox_KeyDown(object sender, KeyRoutedEventArgs e)
                     var isShiftKeyDown = ((int)InputKeyboardSource.GetKeyStateForCurrentThread(Windows.System.VirtualKey.Shift) &
                         (int)Windows.UI.Core.CoreVirtualKeyStates.Down) == (int)Windows.UI.Core.CoreVirtualKeyStates.Down;
                     string text;
-                    textbox.TextDocument.GetText(Microsoft.UI.Text.TextGetOptions.None, out text);
+                    textbox.TextDocument.GetText(TextGetOptions.None, out text);
 
                     var selectionStart = textbox.TextDocument.Selection.StartPosition;
                     var selectionEnd = selectionStart + textbox.TextDocument.Selection.Length;
@@ -246,20 +248,20 @@ private void textbox_KeyDown(object sender, KeyRoutedEventArgs e)
                             selectionStart += 4;
                             selectionEnd += 4;
 
-                            range.Move(Microsoft.UI.Text.TextRangeUnit.Paragraph, 1);
+                            range.Move(TextRangeUnit.Paragraph, 1);
                             while (range.StartPosition < selectionEnd)
                             {
                                 range.Text = "    ";
                                 selectionEnd += 4;
-                                range.Move(Microsoft.UI.Text.TextRangeUnit.Paragraph, 1);
+                                range.Move(TextRangeUnit.Paragraph, 1);
                             }
                         }
                         else // Unindent
                         {
                             bool firstLine = true;
                             while (range.StartPosition < selectionEnd)
                             {
-                                range.MoveEnd(Microsoft.UI.Text.TextRangeUnit.Character, 4);
+                                range.MoveEnd(TextRangeUnit.Character, 4);
                                 var numWhitespace = range.Text.Count(char.IsWhiteSpace);
                                 range = textbox.TextDocument.GetRange(range.StartPosition, range.StartPosition + numWhitespace);
                                 range.Text = "";
@@ -269,7 +271,7 @@ private void textbox_KeyDown(object sender, KeyRoutedEventArgs e)
                                     selectionStart -= numWhitespace;
                                 }
                                 selectionEnd -= numWhitespace;
-                                range.Move(Microsoft.UI.Text.TextRangeUnit.Paragraph, 1);
+                                range.Move(TextRangeUnit.Paragraph, 1);
                             }
                         }
 
@@ -287,11 +289,11 @@ private void textbox_PreviewKeyUp(object sender, KeyRoutedEventArgs e)
         m_lastChangeFromTyping = true;
         switch (e.Key)
         {
-            case Windows.System.VirtualKey.F5:
+            case VirtualKey.F5:
                 LoadContentAndApplyFormatting();
                 break;
 
-            case Windows.System.VirtualKey.Enter:
+            case VirtualKey.Enter:
                 HandleEnter();
                 break;
         }
@@ -318,7 +320,7 @@ private void textbox_TextChanged(object sender, RoutedEventArgs e)
             }
 
             string newText;
-            textbox.TextDocument.GetText(Microsoft.UI.Text.TextGetOptions.None, out newText);
+            textbox.TextDocument.GetText(TextGetOptions.None, out newText);
             if (newText.Length == m_oldText.Length + 1)
             {
                 // Added just one character
@@ -367,12 +369,12 @@ private void textbox_TextChanged(object sender, RoutedEventArgs e)
         }
 
         // Save the text so next time we can compare against the new text
-        textbox.TextDocument.GetText(Microsoft.UI.Text.TextGetOptions.None, out m_oldText);
+        textbox.TextDocument.GetText(TextGetOptions.None, out m_oldText);
     }
 
     private void textbox_ActualThemeChanged(FrameworkElement sender, object args)
     {
-        // Updating the formating for theme change
+        // Updating the formatting for theme change
         var formatter = new XamlTextFormatter(textbox);
         formatter.ApplyColors();
     }
@@ -405,7 +407,7 @@ public void ApplyColors()
         doc.BeginUndoGroup();
 
         string rebText;
-        doc.GetText(Microsoft.UI.Text.TextGetOptions.None, out rebText);
+        doc.GetText(TextGetOptions.None, out rebText);
 
         var startIndex = 0;
         var currentZoneType = ZoneType.Unknown;
