Align icon and menu

tgjones · May 15, 2018 · d9c44e4 · d9c44e4
1 parent 2099354
commit d9c44e4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/Gemini/Gemini.csproj b/src/Gemini/Gemini.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -467,6 +467,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="Framework\ShaderEffects\Scripts\ThemedImage.fx" />
+  </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\Icons\FullScreen.png" />
   </ItemGroup>
@@ -478,4 +479,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/src/Gemini/Themes/VS2013/Controls/Menu.xaml b/src/Gemini/Themes/VS2013/Controls/Menu.xaml
@@ -1,4 +1,4 @@
-<!--
+<!--
   Originally from the Wide framework:
   https://github.com/chandramouleswaran/Wide
   
@@ -63,7 +63,7 @@
                 TextElement.Foreground="{DynamicResource MenuTopLevelHeaderDefaultText}">
             <Border Name="InnerBorder" BorderThickness="0,0,0,1" BorderBrush="Transparent">
                 <Grid>
-                    <ContentPresenter Margin="6,3,6,3" ContentSource="Header" RecognizesAccessKey="True" />
+                    <ContentPresenter Margin="8,3,8,3" ContentSource="Header" RecognizesAccessKey="True" />
                     <Popup Name="Popup" Placement="Bottom" HorizontalOffset="-1.1"
                            IsOpen="{TemplateBinding IsSubmenuOpen}" AllowsTransparency="True"
                            Focusable="False" PopupAnimation="Fade"
@@ -383,4 +383,4 @@
     <Style TargetType="ContextMenu" BasedOn="{StaticResource MetroContextMenu}" />
     <Style TargetType="xcad:ContextMenuEx" BasedOn="{StaticResource MetroContextMenu}" />
     <Style TargetType="xcad:MenuItemEx" BasedOn="{StaticResource MetroMenuItem}" />
-</ResourceDictionary>
+</ResourceDictionary>
diff --git a/src/Gemini/Themes/VS2013/Controls/Window.xaml b/src/Gemini/Themes/VS2013/Controls/Window.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:system="clr-namespace:System;assembly=mscorlib"
                     xmlns:shaderEffects="clr-namespace:Gemini.Framework.ShaderEffects"
@@ -29,7 +29,7 @@
                                               Height="{TemplateBinding Height}"
                                               RenderOptions.BitmapScalingMode="{Binding IconBitmapScalingMode, Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:MetroWindow}}}"
                                               RenderOptions.EdgeMode="{Binding IconEdgeMode, Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:MetroWindow}}}"
-                                              Source="{TemplateBinding Content}" >
+                                              Source="{TemplateBinding Content}" Margin="6,0,0,0">
                                 <controls:MultiFrameImage.Effect>
                                     <shaderEffects:ThemedImageEffect Background="{Binding Converter={StaticResource SolidColorBrushToColorConverter}, Mode=OneWay,
                                                                                           Source={StaticResource DefaultBackground}, Path=Data}"/>
@@ -50,4 +50,4 @@
         Segoe UI, Segoe UI Light, Lucida Sans Unicode, Verdana
     </FontFamily>
 
-</ResourceDictionary>
+</ResourceDictionary>