From e43c8c8ef96b14da1bae2208850077526c2550f5 Mon Sep 17 00:00:00 2001
From: Megalon <megalongaming@gmail.com>
Date: Sat, 9 May 2020 01:10:10 -0700
Subject: [PATCH] Styling for menu

---
 ModAssistant/App.xaml             |  2 +
 ModAssistant/MainWindow.xaml      | 18 +++++----
 ModAssistant/ModAssistant.csproj  |  8 ++++
 ModAssistant/Styles/Menu.xaml     |  8 ++++
 ModAssistant/Styles/MenuItem.xaml | 67 +++++++++++++++++++++++++++++++
 5 files changed, 95 insertions(+), 8 deletions(-)
 create mode 100644 ModAssistant/Styles/Menu.xaml
 create mode 100644 ModAssistant/Styles/MenuItem.xaml

diff --git a/ModAssistant/App.xaml b/ModAssistant/App.xaml
index 54c56f3..2b4ab8a 100644
--- a/ModAssistant/App.xaml
+++ b/ModAssistant/App.xaml
@@ -28,6 +28,8 @@
                 <ResourceDictionary x:Name="GridViewColumnHeader_Style" Source="Styles/GridViewColumnHeader.xaml" />
                 <ResourceDictionary x:Name="ListView_Style" Source="Styles/ListView.xaml" />
                 <ResourceDictionary x:Name="ListViewItem_Style" Source="Styles/ListViewItem.xaml" />
+                <ResourceDictionary x:Name="Menu_Style" Source="Styles/Menu.xaml" />
+                <ResourceDictionary x:Name="MenuItem_Style" Source="Styles/MenuItem.xaml" />
                 <ResourceDictionary x:Name="CheckBox_Style" Source="Styles/CheckBox.xaml" />
                 <ResourceDictionary x:Name="ComboBoxItem_Style" Source="Styles/ComboBoxItem.xaml" />
                 <ResourceDictionary x:Name="ComboBox_Style" Source="Styles/ComboBox.xaml" />
diff --git a/ModAssistant/MainWindow.xaml b/ModAssistant/MainWindow.xaml
index 863059a..155b01c 100644
--- a/ModAssistant/MainWindow.xaml
+++ b/ModAssistant/MainWindow.xaml
@@ -167,7 +167,7 @@
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*" />
                     <ColumnDefinition Width="115" />
-                    <ColumnDefinition Width="115" />
+                    <ColumnDefinition Width="130" />
                 </Grid.ColumnDefinitions>
 
                 <Border
@@ -201,33 +201,35 @@
                 <StackPanel 
                     Grid.Column="2" Orientation="Horizontal"
                     Height="40"
-                    Width="100"
+                    Width="115"
                     Margin="0,10,0,0"
                     HorizontalAlignment="Right">
                     <Button
                         Name="InstallButton"
-                        Width="85"
+                        Width="100"
                         Height="40"
                         HorizontalAlignment="Right"
                         Click="InstallButton_Click"
                         IsEnabled="False">
-                    <StackPanel>
-                        <TextBlock
+                        <StackPanel>
+                            <TextBlock
                             HorizontalAlignment="Center"
                             VerticalAlignment="Bottom"
                             Text="{DynamicResource MainWindow:InstallButtonTop}" />
-                        <TextBlock
+                            <TextBlock
                             HorizontalAlignment="Center"
                             VerticalAlignment="Bottom"
                             Text="{DynamicResource MainWindow:InstallButtonBottom}" />
-                    </StackPanel>
+                        </StackPanel>
                     </Button>
                     <Menu
                         Width="15"
                         Height="40"
                         HorizontalAlignment="Right" >
                         <MenuItem Header="V" Height="40">
-                            <MenuItem Header="Reinstall and Update" Click="ReinstallAllButton_Click"/>
+                            <MenuItem Header="Install, Reinstall, or Update" Click="ReinstallAllButton_Click"/>
+                            <MenuItem Header="Bruh" Click="ReinstallAllButton_Click"/>
+                            <MenuItem Header="Bruh" Click="ReinstallAllButton_Click"/>
                         </MenuItem>
                     </Menu>
                 </StackPanel>
diff --git a/ModAssistant/ModAssistant.csproj b/ModAssistant/ModAssistant.csproj
index ec0f7cb..e2aa06f 100644
--- a/ModAssistant/ModAssistant.csproj
+++ b/ModAssistant/ModAssistant.csproj
@@ -178,6 +178,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Styles\MenuItem.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Styles\Menu.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Styles\RepeatButton.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/ModAssistant/Styles/Menu.xaml b/ModAssistant/Styles/Menu.xaml
new file mode 100644
index 0000000..c7a4e12
--- /dev/null
+++ b/ModAssistant/Styles/Menu.xaml
@@ -0,0 +1,8 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Style TargetType="Menu">
+        <Setter Property="Background" Value="{DynamicResource ButtonBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ButtonBackground}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Foreground" Value="{DynamicResource TextColor}" />
+    </Style>
+</ResourceDictionary>
diff --git a/ModAssistant/Styles/MenuItem.xaml b/ModAssistant/Styles/MenuItem.xaml
new file mode 100644
index 0000000..bb9eb15
--- /dev/null
+++ b/ModAssistant/Styles/MenuItem.xaml
@@ -0,0 +1,67 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Style TargetType="MenuItem">
+        <Setter Property="Background" Value="{DynamicResource ButtonBackground}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource ButtonBackground}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Foreground" Value="{DynamicResource TextColor}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type MenuItem}">
+                    <Border
+                        x:Name="templateRoot"
+                        BorderBrush="{DynamicResource ButtonOutline}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        Background="{TemplateBinding Background}"
+                        SnapsToDevicePixels="True">
+                        <Grid VerticalAlignment="Center">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                            <ContentPresenter x:Name="Icon" Content="{TemplateBinding Icon}" ContentSource="Icon" HorizontalAlignment="Center" Height="16" Margin="3" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Center" Width="16"/>
+                            <Path x:Name="GlyphPanel" Data="F1M10,1.2L4.7,9.1 4.5,9.1 0,5.2 1.3,3.5 4.3,6.1 8.3,0 10,1.2z" Fill="{TemplateBinding Foreground}" FlowDirection="LeftToRight" Margin="3" Visibility="Collapsed" VerticalAlignment="Center"/>
+                            <ContentPresenter ContentTemplate="{TemplateBinding HeaderTemplate}" Content="{TemplateBinding Header}" Grid.Column="1" ContentStringFormat="{TemplateBinding HeaderStringFormat}" ContentSource="Header" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                            <Popup x:Name="PART_Popup" AllowsTransparency="True" Focusable="False" IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}" PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimationKey}}" Placement="Top">
+                                <Border x:Name="SubMenuBorder" BorderBrush="{DynamicResource ButtonOutline}"  BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="0">
+                                    <ScrollViewer x:Name="SubMenuScrollViewer" Style="{DynamicResource {ComponentResourceKey ResourceId=MenuScrollViewer, TypeInTargetAssembly={x:Type FrameworkElement}}}">
+                                        <Grid RenderOptions.ClearTypeHint="Enabled">
+                                            <Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="1">
+                                                <Rectangle x:Name="OpaqueRect" Fill="Black" Height="{Binding ActualHeight, ElementName=SubMenuBorder}" Width="{Binding ActualWidth, ElementName=SubMenuBorder}"/>
+                                            </Canvas>
+                                            <Rectangle Fill="#FFD7D7D7" HorizontalAlignment="Left" Margin="29,2,0,2" Width="1" />
+                                            <ItemsPresenter x:Name="ItemsPresenter" Margin="0,0,0,0" KeyboardNavigation.DirectionalNavigation="Cycle" Grid.IsSharedSizeScope="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" KeyboardNavigation.TabNavigation="Cycle"/>
+                                        </Grid>
+                                    </ScrollViewer>
+                                </Border>
+                            </Popup>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsSuspendingPopupAnimation" Value="True">
+                            <Setter Property="PopupAnimation" TargetName="PART_Popup" Value="None"/>
+                        </Trigger>
+                        <Trigger Property="Icon" Value="{x:Null}">
+                            <Setter Property="Visibility" TargetName="Icon" Value="Collapsed"/>
+                        </Trigger>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter Property="Visibility" TargetName="GlyphPanel" Value="Visible"/>
+                            <Setter Property="Visibility" TargetName="Icon" Value="Collapsed"/>
+                        </Trigger>
+                        <Trigger Property="IsHighlighted" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource ButtonHighlightedBackground}" />
+                            <Setter Property="Foreground" Value="{DynamicResource TextHighlighted}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="TextElement.Foreground" TargetName="templateRoot" Value="#FF707070"/>
+                            <Setter Property="Fill" TargetName="GlyphPanel" Value="#FF707070"/>
+                        </Trigger>
+                        <Trigger Property="CanContentScroll" SourceName="SubMenuScrollViewer" Value="False">
+                            <Setter Property="Canvas.Top" TargetName="OpaqueRect" Value="{Binding VerticalOffset, ElementName=SubMenuScrollViewer}"/>
+                            <Setter Property="Canvas.Left" TargetName="OpaqueRect" Value="{Binding HorizontalOffset, ElementName=SubMenuScrollViewer}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>