From 23f13957cd75012a36d3055e1d72e14733e8c38e Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 20 Aug 2020 23:16:25 +0100
Subject: [PATCH] add context menu back.

---
 src/Avalonia.Themes.Default/TextBox.xaml | 1 +
 src/Avalonia.Themes.Fluent/TextBox.xaml  | 1 +
 tests/Avalonia.LeakTests/ControlTests.cs | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Themes.Default/TextBox.xaml b/src/Avalonia.Themes.Default/TextBox.xaml
index dc6dca4898..8e5f576143 100644
--- a/src/Avalonia.Themes.Default/TextBox.xaml
+++ b/src/Avalonia.Themes.Default/TextBox.xaml
@@ -14,6 +14,7 @@
     <Setter Property="SelectionBrush" Value="{DynamicResource HighlightBrush}"/>
     <Setter Property="SelectionForegroundBrush" Value="{DynamicResource HighlightForegroundBrush}"/>
     <Setter Property="Padding" Value="4"/>
+    <Setter Property="ContextMenu" Value="{DynamicResource DefaultTextBoxContextMenu}" />
     <Setter Property="Template">
       <ControlTemplate>
         <Border Name="border"
diff --git a/src/Avalonia.Themes.Fluent/TextBox.xaml b/src/Avalonia.Themes.Fluent/TextBox.xaml
index a5eed1cc76..ca7cc19b7b 100644
--- a/src/Avalonia.Themes.Fluent/TextBox.xaml
+++ b/src/Avalonia.Themes.Fluent/TextBox.xaml
@@ -33,6 +33,7 @@
     <Setter Property="MinWidth" Value="{DynamicResource TextControlThemeMinWidth}" />
     <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
     <Setter Property="FocusAdorner" Value="{x:Null}" />
+    <Setter Property="ContextMenu" Value="{DynamicResource DefaultTextBoxContextMenu}" />
     <Setter Property="Template">
       <ControlTemplate>
         <DockPanel>
diff --git a/tests/Avalonia.LeakTests/ControlTests.cs b/tests/Avalonia.LeakTests/ControlTests.cs
index 1f0358a6c3..0b81276240 100644
--- a/tests/Avalonia.LeakTests/ControlTests.cs
+++ b/tests/Avalonia.LeakTests/ControlTests.cs
@@ -426,7 +426,7 @@ namespace Avalonia.LeakTests
         public void Attached_ContextMenu_Is_Freed()
         {
             using (Start())
-            {   
+            {
                 void AttachShowAndDetachContextMenu(Control control)
                 {
                     var contextMenu = new ContextMenu