Skip to content

Commit 103e106

Browse files
committed
Disabling ContextMenu style in VS2013
1 parent 5554de5 commit 103e106

File tree

1 file changed

+6
-6
lines changed
  • source/Components/AvalonDock.Themes.VS2013/Themes

1 file changed

+6
-6
lines changed

source/Components/AvalonDock.Themes.VS2013/Themes/Generic.xaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@
2626

2727
<Style x:Key="DropDownControlArea" TargetType="avalonDockControls:DropDownControlArea" />
2828

29-
<!--
30-
Re-styling this in AvalonDock since the menu on the drop-down button for more documents is otherwise black
31-
BugFix for Issue http://avalondock.codeplex.com/workitem/15743
32-
-->
33-
3429
<!--
3530
dirkster99: Removing this ToolTip style:
3631
1) As it does not appear to add any additional value?
@@ -73,7 +68,7 @@
7368
Re-styling this in AvalonDock since the menu on the drop-down button for more documents is otherwise black
7469
BugFix for Issue http://avalondock.codeplex.com/workitem/15743
7570
-->
76-
<Style TargetType="{x:Type MenuItem}">
71+
<Style BasedOn="{StaticResource {x:Type MenuItem}}" TargetType="{x:Type MenuItem}">
7772
<Setter Property="HeaderTemplate" Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplate}" />
7873
<Setter Property="HeaderTemplateSelector" Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplateSelector}" />
7974
<Setter Property="BorderThickness" Value="0" />
@@ -90,6 +85,10 @@
9085
-->
9186
</Style>
9287

88+
<!--
89+
dirkster99: Removing this ContextMenu style:
90+
1) As it does not appear to add any additional value?
91+
2) As it overwrites other ContextMenu styles (eg using MLib in Edi or Aehnlich)
9392
<Style BasedOn="{StaticResource {x:Type ContextMenu}}" TargetType="{x:Type ContextMenu}">
9493
<Setter Property="TextOptions.TextFormattingMode" Value="Display" />
9594
<Setter Property="Background" Value="{DynamicResource {x:Static reskeys:ResourceKeys.Background}}" />
@@ -137,6 +136,7 @@
137136
</Setter.Value>
138137
</Setter>
139138
</Style>
139+
-->
140140

141141
<Style BasedOn="{StaticResource {x:Type ContextMenu}}" TargetType="{x:Type avalonDockControls:ContextMenuEx}" />
142142
<Style x:Key="AvalonDockThemeVs2013ToolButtonStyle" TargetType="ToggleButton">

0 commit comments

Comments
 (0)