chore: Adjust for RichEditBox

unoplatform · Nov 17, 2022 · 0dcbb8d · 0dcbb8d
1 parent 972111e
commit 0dcbb8d
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 22 deletions.
diff --git a/....Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/CommandBarFlyoutMainPage.xaml.cs b/....Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/CommandBarFlyoutMainPage.xaml.cs
@@ -38,7 +38,7 @@ public void OnExtraCommandBarFlyoutTestsClicked(object sender, object args)
         }
         private void CmbCommandBarFlyoutOutputDebugStringLevel_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-#if HAS_UNO
+#if false
 			MUXControlsTestHooks.SetOutputDebugStringLevelForType(
                 "CommandBarFlyout",
                 cmbCommandBarFlyoutOutputDebugStringLevel.SelectedIndex == 1 || cmbCommandBarFlyoutOutputDebugStringLevel.SelectedIndex == 2,

diff --git a/...UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/CommandBarFlyoutPage.xaml b/...UITests.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/CommandBarFlyoutPage.xaml
@@ -201,7 +201,7 @@
                     <AppBarToggleButton x:Name="FavoriteToggleButton9" AutomationProperties.AutomationId="FavoriteToggleButton9" Label="Favorite" Icon="Favorite" Checked="OnElementChecked" Unchecked="OnElementUnchecked" />
                 </muxc:CommandBarFlyout.SecondaryCommands>
             </muxc:CommandBarFlyout>
-            <contract13Present:CommandBarFlyout Placement="Right" x:Name="Flyout10" AutomationProperties.AutomationId="Flyout10" Opened="OnFlyoutOpened" Closed="OnFlyoutClosed">
+            <!--<contract13Present:CommandBarFlyout Placement="Right" x:Name="Flyout10" AutomationProperties.AutomationId="Flyout10" Opened="OnFlyoutOpened" Closed="OnFlyoutClosed">
                 <AppBarButton x:Name="CutButton10" AutomationProperties.AutomationId="CutButton10" Label="Cut" Icon="Cut" Click="OnElementClicked" />
                 <AppBarButton x:Name="CopyButton10" AutomationProperties.AutomationId="CopyButton10" Label="Copy" Icon="Copy" Click="OnElementClicked" />
                 <AppBarButton x:Name="PasteButton10" AutomationProperties.AutomationId="PasteButton10" Label="Paste" Icon="Paste" Click="OnElementClicked" />
@@ -214,7 +214,7 @@
                     <AppBarButton x:Name="SelectAllButton10" AutomationProperties.AutomationId="SelectAllButton10" Label="Select all" Click="OnElementClicked" />
                     <AppBarToggleButton x:Name="FavoriteToggleButton10" AutomationProperties.AutomationId="FavoriteToggleButton10" Label="Favorite" Icon="Favorite" Checked="OnElementChecked" Unchecked="OnElementUnchecked" />
                 </contract13Present:CommandBarFlyout.SecondaryCommands>
-            </contract13Present:CommandBarFlyout>
+            </contract13Present:CommandBarFlyout>-->
         </Grid.Resources>
         <ScrollViewer>
             <StackPanel>

diff --git a/...sts.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/TextCommandBarFlyoutPage.xaml b/...sts.Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/TextCommandBarFlyoutPage.xaml
@@ -36,7 +36,7 @@
                     </Grid.ColumnDefinitions>
                     <TextBox x:Name="TextBox1" AutomationProperties.AutomationId="TextBox" Text="Lorem ipsum ergo sum" Margin="10" />
                     <TextBlock x:Name="TextBlock1" AutomationProperties.AutomationId="TextBlock" Text="Lorem ipsum ergo sum" Margin="10" IsTextSelectionEnabled="True" Grid.Row="1" />
-                    <RichEditBox x:Name="RichEditBox1" AutomationProperties.AutomationId="RichEditBox" Margin="10" Grid.Row="2" />
+                    <!--<RichEditBox x:Name="RichEditBox1" AutomationProperties.AutomationId="RichEditBox" Margin="10" Grid.Row="2" />-->
                     <RichTextBlock x:Name="RichTextBlock1" AutomationProperties.AutomationId="RichTextBlock" Margin="10" IsTextSelectionEnabled="True" Grid.Row="3">
                         <Paragraph>
                             <Bold>

diff --git a/....Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/TextCommandBarFlyoutPage.xaml.cs b/....Shared/Microsoft_UI_Xaml_Controls/CommandBarFlyoutTests/TextCommandBarFlyoutPage.xaml.cs
@@ -27,8 +27,10 @@ public TextCommandBarFlyoutPage()
         {
             this.InitializeComponent();
 
-            RichEditBox1.Document.SetText(Windows.UI.Text.TextSetOptions.None, "Lorem ipsum ergo sum");
-            Clipboard.ContentChanged += OnClipboardContentChanged;
+#if !HAS_UNO
+			RichEditBox1.Document.SetText(Windows.UI.Text.TextSetOptions.None, "Lorem ipsum ergo sum");
+#endif
+			Clipboard.ContentChanged += OnClipboardContentChanged;
 
             if (ApiInformation.IsEnumNamedValuePresent("Windows.UI.Xaml.Controls.Primitives.FlyoutPlacementMode", "BottomEdgeAlignedLeft"))
             {
@@ -52,8 +54,10 @@ public TextCommandBarFlyoutPage()
             {
                 TextBox1.ContextFlyout = TextControlContextFlyout;
                 TextBlock1.ContextFlyout = TextControlContextFlyout;
-                RichEditBox1.ContextFlyout = TextControlContextFlyout;
-                RichTextBlock1.ContextFlyout = TextControlContextFlyout;
+#if !HAS_UNO
+				RichEditBox1.ContextFlyout = TextControlContextFlyout;
+#endif
+				RichTextBlock1.ContextFlyout = TextControlContextFlyout;
                 PasswordBox1.ContextFlyout = TextControlContextFlyout;
             }
 
@@ -71,8 +75,10 @@ public TextCommandBarFlyoutPage()
 
                 if (ApiInformation.IsPropertyPresent("Windows.UI.Xaml.Controls.RichEditBox", "SelectionFlyout"))
                 {
-                    RichEditBox1.SelectionFlyout = TextControlSelectionFlyout;
-                }
+#if !HAS_UNO
+					RichEditBox1.SelectionFlyout = TextControlSelectionFlyout;
+#endif
+				}
 
                 if (ApiInformation.IsPropertyPresent("Windows.UI.Xaml.Controls.RichTextBlock", "SelectionFlyout"))
                 {
@@ -135,8 +141,10 @@ private void OnTextBlockSelectAllClicked(object sender, object args)
 
         private void OnRichEditBoxSelectAllClicked(object sender, object args)
         {
-            RichEditBox1.Document.Selection.Expand(Windows.UI.Text.TextRangeUnit.Story);
-        }
+#if !HAS_UNO
+			RichEditBox1.Document.Selection.Expand(Windows.UI.Text.TextRangeUnit.Story);
+#endif
+		}
 
         private void OnRichTextBlockSelectAllClicked(object sender, object args)
         {
@@ -155,8 +163,10 @@ private void OnTextBlockClearSelectionClicked(object sender, object args)
 
         private void OnRichEditBoxClearSelectionClicked(object sender, object args)
         {
-            RichEditBox1.Document.Selection.Collapse(true);
-        }
+#if !HAS_UNO
+			RichEditBox1.Document.Selection.Collapse(true);
+#endif
+		}
 
         private void OnTextBoxFillWithTextClicked(object sender, object args)
         {
@@ -165,8 +175,10 @@ private void OnTextBoxFillWithTextClicked(object sender, object args)
 
         private void OnRichEditBoxFillWithTextClicked(object sender, object args)
         {
+#if !HAS_UNO
             RichEditBox1.Document.SetText(TextSetOptions.None, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
-        }
+#endif
+		}
 
         private void OnRichTextBlockClearSelectionClicked(object sender, object args)
         {
@@ -185,8 +197,10 @@ private void OnShowTextControlFlyoutOnTextBlockClicked(object sender, object arg
 
         private void OnShowTextControlFlyoutOnRichEditBoxClicked(object sender, object args)
         {
-            ShowTextControlContextFlyoutTransient(RichEditBox1);
-        }
+#if !HAS_UNO
+			ShowTextControlContextFlyoutTransient(RichEditBox1);
+#endif
+		}
 
         private void OnShowTextControlFlyoutOnRichTextBlockClicked(object sender, object args)
         {
@@ -210,8 +224,10 @@ private void OnShowStandardTextControlFlyoutOnTextBlockClicked(object sender, ob
 
         private void OnShowStandardTextControlFlyoutOnRichEditBoxClicked(object sender, object args)
         {
-            ShowTextControlContextFlyoutStandard(RichEditBox1);
-        }
+#if !HAS_UNO
+			ShowTextControlContextFlyoutStandard(RichEditBox1);
+#endif
+		}
 
         private void OnShowStandardTextControlFlyoutOnRichTextBlockClicked(object sender, object args)
         {
@@ -264,9 +280,11 @@ private void OnSetClipboardContentsClicked(object sender, object args)
 
         private void OnGetRichEditBoxRtfContentClicked(object sender, object args)
         {
-            string rtfContent;
+#if !HAS_UNO
+			string rtfContent;
             RichEditBox1.Document.GetText(TextGetOptions.FormatRtf, out rtfContent);
-            StatusReportingTextBox.Text = rtfContent;
-        }
+			StatusReportingTextBox.Text = rtfContent;
+#endif
+		}
     }
 }