From 103e1068bc9f5bae8fef275a0e785393b4115764 Mon Sep 17 00:00:00 2001
From: Dirkster99 <Dirk.Bahle@gmx.de>
Date: Fri, 14 Aug 2020 22:09:33 +0200
Subject: [PATCH] Disabling ContextMenu style in VS2013

---
 .../AvalonDock.Themes.VS2013/Themes/Generic.xaml     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/source/Components/AvalonDock.Themes.VS2013/Themes/Generic.xaml b/source/Components/AvalonDock.Themes.VS2013/Themes/Generic.xaml
index 97572c72..7e96258e 100644
--- a/source/Components/AvalonDock.Themes.VS2013/Themes/Generic.xaml
+++ b/source/Components/AvalonDock.Themes.VS2013/Themes/Generic.xaml
@@ -26,11 +26,6 @@
 
 	<Style x:Key="DropDownControlArea" TargetType="avalonDockControls:DropDownControlArea" />
 
-	<!--
-		Re-styling this in AvalonDock since the menu on the drop-down button for more documents is otherwise black
-		BugFix for Issue http://avalondock.codeplex.com/workitem/15743
-	-->
-
 	<!--
 	dirkster99: Removing this ToolTip style:
 	1) As it does not appear to add any additional value?
@@ -73,7 +68,7 @@
 		Re-styling this in AvalonDock since the menu on the drop-down button for more documents is otherwise black
 		BugFix for Issue http://avalondock.codeplex.com/workitem/15743
 	-->
-	<Style TargetType="{x:Type MenuItem}">
+	<Style BasedOn="{StaticResource {x:Type MenuItem}}" TargetType="{x:Type MenuItem}">
 		<Setter Property="HeaderTemplate" Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplate}" />
 		<Setter Property="HeaderTemplateSelector" Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplateSelector}" />
 		<Setter Property="BorderThickness" Value="0" />
@@ -90,6 +85,10 @@
 		-->
 	</Style>
 
+	<!--
+	dirkster99: Removing this ContextMenu style:
+	1) As it does not appear to add any additional value?
+	2) As it overwrites other ContextMenu styles (eg using MLib in Edi or Aehnlich)
 	<Style BasedOn="{StaticResource {x:Type ContextMenu}}" TargetType="{x:Type ContextMenu}">
 		<Setter Property="TextOptions.TextFormattingMode" Value="Display" />
 		<Setter Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.Background}}" />
@@ -137,6 +136,7 @@
 			</Setter.Value>
 		</Setter>
 	</Style>
+	-->
 
 	<Style BasedOn="{StaticResource {x:Type ContextMenu}}" TargetType="{x:Type avalonDockControls:ContextMenuEx}" />
 	<Style x:Key="AvalonDockThemeVs2013ToolButtonStyle" TargetType="ToggleButton">