From c987f6a498191a198a43729bb4c6280e6e432724 Mon Sep 17 00:00:00 2001
From: Curtis Wensley <curtis.wensley@gmail.com>
Date: Mon, 22 Apr 2013 23:08:36 -0700
Subject: [PATCH] No more need for Controls.Menu.xaml to fix menus in
 mahapps.metro

---
 Source/JabbR.Eto.Wpf/Controls.Menu.xaml   | 173 ----------------------
 Source/JabbR.Eto.Wpf/JabbR.Eto.Wpf.csproj |   6 -
 Source/JabbR.Eto.Wpf/Main.cs              |   3 +-
 3 files changed, 1 insertion(+), 181 deletions(-)
 delete mode 100644 Source/JabbR.Eto.Wpf/Controls.Menu.xaml

diff --git a/Source/JabbR.Eto.Wpf/Controls.Menu.xaml b/Source/JabbR.Eto.Wpf/Controls.Menu.xaml
deleted file mode 100644
index 206e83e..0000000
--- a/Source/JabbR.Eto.Wpf/Controls.Menu.xaml
+++ /dev/null
@@ -1,173 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    >
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Colours.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-    <!--Menu-->
-    
-    <SolidColorBrush x:Key="MenuBackground" Color="{DynamicResource WhiteColor}"/>
-    <SolidColorBrush x:Key="MenuSeparatorBorderBrush" Color="#333337"/>
-    <SolidColorBrush x:Key="MenuItemHighlightedBackground" Color="{DynamicResource HighlightLightColor}"/>
-    <SolidColorBrush x:Key="SubmenuItemBackground" Color="#FFEEEEEE"/>
-    <SolidColorBrush x:Key="SubmenuItemBackgroundHighlighted" Color="#FFFFFFFF"/>
-    <SolidColorBrush x:Key="MenuDisabledForeground" Color="#FFFFFFFF"/>
-    <SolidColorBrush x:Key="BackgroundSelected" Color="#007ACC"/>
-
-    <Color x:Key="DropShadowColor">#22EEEEEE</Color>
-    
-    <Style TargetType="{x:Type Menu}" x:Key="MetroMenu">
-        <Style.Resources>
-            <Style x:Key="{x:Static MenuItem.SeparatorStyleKey}" TargetType="Separator">
-                <Setter Property="Height" Value="1"/>
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="Separator">
-                            <Border BorderBrush="{StaticResource MenuSeparatorBorderBrush}" BorderThickness="1" Margin="25,0,0,0"/>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
-            <Style TargetType="{x:Type MenuItem}">
-                <Setter Property="Foreground" Value="{Binding Path=Foreground, RelativeSource={RelativeSource AncestorType={x:Type Menu}}}"/>
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="{x:Type MenuItem}">
-                            <!--Border 1-->
-                            <Border x:Name="Border" Background="Transparent" BorderBrush="Transparent" BorderThickness="1" SnapsToDevicePixels="False">
-                                <Grid x:Name="Grid">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition x:Name="Col0" MinWidth="17" Width="Auto" SharedSizeGroup="MenuItemIconColumnGroup"/>
-                                        <ColumnDefinition Width="Auto" SharedSizeGroup="MenuTextColumnGroup"/>
-                                        <ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemIGTColumnGroup"/>
-                                        <ColumnDefinition x:Name="Col3" Width="14"/>
-                                    </Grid.ColumnDefinitions>
-                                    <ContentPresenter Grid.Column="0" x:Name="Icon" VerticalAlignment="Center" ContentSource="Icon"/>
-                                    <ContentPresenter Grid.Column="1" Margin="{TemplateBinding Padding}" 
-                                                      x:Name="HeaderHost" RecognizesAccessKey="True" 
-                                                      ContentSource="Header" VerticalAlignment="Center" />
-                                    <ContentPresenter Grid.Column="2" Margin="8,1,8,1" x:Name="IGTHost" ContentSource="InputGestureText" VerticalAlignment="Center"/>
-                                    <Grid Grid.Column="3" Margin="4,0,6,0" x:Name="ArrowPanel" VerticalAlignment="Center">
-                                        <Path x:Name="ArrowPanelPath" HorizontalAlignment="Right" VerticalAlignment="Center" 
-                                              Fill="{TemplateBinding Foreground}" Data="M0,0 L0,8 L4,4 z"/>
-                                    </Grid>
-                                    <Popup IsOpen="{Binding Path=IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}" 
-                                           Placement="Right" HorizontalOffset="-1" x:Name="SubMenuPopup" Focusable="false"
-                                           PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimationKey}}"
-                                           AllowsTransparency="True">
-                                        <Grid Margin="0,0,5,5">
-                                            <!--Border 2-->
-                                            <Border x:Name="SubMenuBorder" 
-                                                    BorderBrush="{StaticResource MenuSeparatorBorderBrush}"
-                                                    BorderThickness="1" Background="{StaticResource SubmenuItemBackground}" 
-                                                    SnapsToDevicePixels="True">
-                                                <Grid x:Name="SubMenu" Grid.IsSharedSizeScope="True" Margin="2">
-                                                    <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle"/>
-                                                </Grid>
-                                                <Border.Effect>
-                                                    <DropShadowEffect ShadowDepth="4" Color="{StaticResource DropShadowColor}"/>
-                                                </Border.Effect>
-                                            </Border>
-                                            <!--Border 3-->
-                                            <Border Margin="1,0,0,0" x:Name="TransitionBorder" Width="0" Height="2" 
-                                                    VerticalAlignment="Top" HorizontalAlignment="Left" 
-                                                    Background="{StaticResource SubmenuItemBackground}" SnapsToDevicePixels="False"
-                                                    BorderThickness="1" BorderBrush="{StaticResource SubmenuItemBackground}"/>
-                                        </Grid>
-                                    </Popup>
-                                </Grid>
-                            </Border>
-                            <ControlTemplate.Triggers>
-                                <Trigger Property="Role" Value="TopLevelHeader">
-                                    <Setter Property="Padding" Value="6,0,6,2"/>
-                                    <Setter TargetName="SubMenuPopup" Property="Placement" Value="Bottom"/>
-                                    <Setter TargetName="Col0" Property="MinWidth" Value="0"/>
-                                    <Setter TargetName="Col3" Property="Width" Value="Auto"/>
-                                    <Setter TargetName="Icon" Property="Visibility" Value="Collapsed"/>
-                                    <Setter TargetName="IGTHost" Property="Visibility" Value="Collapsed" />
-                                    <Setter TargetName="ArrowPanel" Property="Visibility" Value="Collapsed"/>
-                                    <Setter TargetName="SubMenuBorder" Property="BorderThickness" Value="1,1,1,1"/>
-                                    <Setter TargetName="SubMenu" Property="Margin" Value="2,3,2,2"/>
-                                    <Setter TargetName="TransitionBorder" Property="Width" Value="{Binding ActualWidth, ElementName=Grid}"/>
-                                </Trigger>
-                                <Trigger Property="Role" Value="TopLevelItem">
-                                    <Setter Property="Padding" Value="6,0,6,2"/>
-                                    <Setter TargetName="Col0" Property="MinWidth" Value="0"/>
-                                    <Setter TargetName="Col3" Property="Width" Value="Auto"/>
-                                    <Setter TargetName="Icon" Property="Visibility" Value="Collapsed"/>
-                                    <Setter TargetName="IGTHost" Property="Visibility" Value="Collapsed"/>
-                                    <Setter TargetName="ArrowPanel" Property="Visibility" Value="Collapsed"/>
-                                </Trigger>
-                                <Trigger Property="Role" Value="SubmenuHeader">
-                                    <Setter Property="DockPanel.Dock" Value="Top"/>
-                                    <Setter Property="Padding" Value="10,3,0,3"/>
-                                    <Setter TargetName="Border" Property="MinHeight" Value="22"/>
-                                    <Setter TargetName="Border" Property="Background" Value="{StaticResource SubmenuItemBackground}"/>
-                                </Trigger>
-                                <Trigger Property="Role" Value="SubmenuItem">
-                                    <Setter Property="DockPanel.Dock" Value="Top"/>
-                                    <Setter Property="Padding" Value="10,3,0,3"/>
-                                    <Setter TargetName="Border" Property="MinHeight" Value="22"/>
-                                    <Setter TargetName="ArrowPanel" Property="Visibility" Value="Collapsed"/>
-                                    <Setter TargetName="Border" Property="Background" Value="{StaticResource SubmenuItemBackground}"/>
-                                </Trigger>
-                                <MultiTrigger>
-                                    <MultiTrigger.Conditions>
-                                        <Condition Property="IsHighlighted" Value="true"/>
-                                        <Condition Property="Role" Value="TopLevelHeader"/>
-                                    </MultiTrigger.Conditions>
-                                    <Setter TargetName="Border" Property="Background" Value="{StaticResource MenuItemHighlightedBackground}"/>
-                                </MultiTrigger>
-                                <MultiTrigger>
-                                    <MultiTrigger.Conditions>
-                                        <Condition Property="IsHighlighted" Value="true"/>
-                                        <Condition Property="Role" Value="TopLevelItem"/>
-                                    </MultiTrigger.Conditions>
-                                    <Setter TargetName="Border" Property="Background" Value="{StaticResource MenuItemHighlightedBackground}"/>
-                                </MultiTrigger>
-                                <MultiTrigger>
-                                    <MultiTrigger.Conditions>
-                                        <Condition Property="IsHighlighted" Value="true"/>
-                                        <Condition Property="Role" Value="SubmenuHeader"/>
-                                    </MultiTrigger.Conditions>
-                                    <Setter TargetName="Border" Property="Background" Value="{StaticResource SubmenuItemBackgroundHighlighted}"/>
-                                </MultiTrigger>
-                                <MultiTrigger>
-                                    <MultiTrigger.Conditions>
-                                        <Condition Property="IsHighlighted" Value="true"/>
-                                        <Condition Property="Role" Value="SubmenuItem"/>
-                                    </MultiTrigger.Conditions>
-                                    <Setter TargetName="Border" Property="Background" Value="{StaticResource SubmenuItemBackgroundHighlighted}"/>
-                                </MultiTrigger>
-                                <MultiTrigger>
-                                    <MultiTrigger.Conditions>
-                                        <Condition Property="IsSubmenuOpen" Value="true"/>
-                                        <Condition Property="Role" Value="TopLevelHeader"/>
-                                    </MultiTrigger.Conditions>
-                                    <Setter TargetName="Border" Property="Background" Value="{StaticResource SubmenuItemBackground}"/>
-                                    <Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource MenuSeparatorBorderBrush}"/>
-                                    <Setter TargetName="Border" Property="BorderThickness" Value="1,1,1,0"/>
-                                </MultiTrigger>
-                                <Trigger Property="IsSubmenuOpen" Value="true">
-                                    <Setter TargetName="ArrowPanelPath" Property="Fill" Value="{StaticResource BackgroundSelected}"/>
-                                </Trigger>
-                                <Trigger Property="IsSuspendingPopupAnimation" Value="true">
-                                    <Setter TargetName="SubMenuPopup" Property="PopupAnimation" Value="None"/>
-                                </Trigger>
-                                <Trigger Property="Icon" Value="{x:Null}">
-                                    <Setter TargetName="Icon" Property="Visibility" Value="Collapsed"/>
-                                </Trigger>
-                                <Trigger Property="IsEnabled" Value="False">
-                                    <Setter Property="Foreground" Value="{StaticResource MenuDisabledForeground}"/>
-                                </Trigger>
-                            </ControlTemplate.Triggers>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
-        </Style.Resources>
-        <Setter Property="Background" Value="{StaticResource MenuBackground}"/>
-        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-    </Style>
-    <Style TargetType="Menu" BasedOn="{StaticResource MetroMenu}" />
-</ResourceDictionary>
\ No newline at end of file
diff --git a/Source/JabbR.Eto.Wpf/JabbR.Eto.Wpf.csproj b/Source/JabbR.Eto.Wpf/JabbR.Eto.Wpf.csproj
index bb4cc89..b7116a9 100644
--- a/Source/JabbR.Eto.Wpf/JabbR.Eto.Wpf.csproj
+++ b/Source/JabbR.Eto.Wpf/JabbR.Eto.Wpf.csproj
@@ -251,12 +251,6 @@
     </Content>
     <Content Include="JabbReto.ico" />
   </ItemGroup>
-  <ItemGroup>
-    <Page Include="Controls.Menu.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.5">
       <Visible>False</Visible>
diff --git a/Source/JabbR.Eto.Wpf/Main.cs b/Source/JabbR.Eto.Wpf/Main.cs
index c1e13bd..1a41beb 100644
--- a/Source/JabbR.Eto.Wpf/Main.cs
+++ b/Source/JabbR.Eto.Wpf/Main.cs
@@ -20,7 +20,7 @@ public static void Main (string[] args)
 			generator.Add<IDialog> (() => new Controls.CustomDialog ());
 			generator.Add<IForm> (() => new Controls.CustomForm ());
 			generator.Add<IWebView> (() => new Controls.CefSharpWebViewHandler ());
-			generator.Add<IJabbRApplication> (() => new JabbRApplicationHandler ());
+            generator.Add<IJabbRApplication>(() => new JabbRApplicationHandler());
 
 			Style.Add<Controls.CustomForm> (null, handler => {
 				AddResources (handler.Control);
@@ -48,7 +48,6 @@ static void AddResources (System.Windows.Window window)
 				window.Resources.MergedDictionaries.Add (new sw.ResourceDictionary { Source = new Uri ("pack://application:,,,/MahApps.Metro;component/Styles/Accents/Blue.xaml", UriKind.RelativeOrAbsolute) });
 				window.Resources.MergedDictionaries.Add (new sw.ResourceDictionary { Source = new Uri ("pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml", UriKind.RelativeOrAbsolute) });
 				window.Resources.MergedDictionaries.Add (new sw.ResourceDictionary { Source = new Uri ("pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml", UriKind.RelativeOrAbsolute) });
-				window.Resources.MergedDictionaries.Add (new sw.ResourceDictionary { Source = new Uri ("pack://application:,,,/JabbReto;component/Controls.Menu.xaml", UriKind.RelativeOrAbsolute) });
 			}
 		}