Skip to content

Fix HorizontalAlignment of ContextMenu Icon #4051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 24, 2021
Merged

Fix HorizontalAlignment of ContextMenu Icon #4051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c3b39e
Fix HorizontalAlignment of ContextMenu Icon
punker76 Feb 23, 2021
8fa30d8
Pin cake and dependencies
punker76 Feb 23, 2021
bfdb221
Use global .NET tools
punker76 Feb 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,8 @@ src/MahApps.Metro/Styles/Themes/*.xaml
!src/MahApps.Metro/Styles/Themes/Theme.Template.xaml

# cake
tools/
tools/*
!tools/packages.config

# XamlStyler
!XamlStyler/
18 changes: 9 additions & 9 deletions build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
// TOOLS / ADDINS
///////////////////////////////////////////////////////////////////////////////

#module nuget:?package=Cake.DotNetTool.Module
#tool "dotnet:?package=NuGetKeyVaultSignTool&version=1.2.28"
#tool "dotnet:?package=AzureSignTool&version=2.0.17"

#tool GitVersion.CommandLine&version=5.5.1
#tool gitreleasemanager
#tool xunit.runner.console
#tool vswhere
#addin Cake.Figlet
#module nuget:?package=Cake.DotNetTool.Module&version=0.5.0
#tool dotnet:?package=NuGetKeyVaultSignTool&version=1.2.28
#tool dotnet:?package=AzureSignTool&version=2.0.17
#tool dotnet:?package=GitReleaseManager.Tool&version=0.11.0
#tool dotnet:?package=GitVersion.Tool&version=5.6.6

#tool xunit.runner.console&version=2.4.1
#tool vswhere&version=2.8.4
#addin nuget:?package=Cake.Figlet&version=1.4.0

///////////////////////////////////////////////////////////////////////////////
// ARGUMENTS
Expand Down
7 changes: 4 additions & 3 deletions src/MahApps.Metro/Styles/Controls.MenuItem.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@
Margin="5 0 0 0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Data="{StaticResource Checkmark}"
Data="{DynamicResource Checkmark}"
Fill="{DynamicResource MahApps.Brushes.CheckmarkFill}"
FlowDirection="LeftToRight"
Visibility="Collapsed" />
Expand All @@ -377,7 +377,7 @@
<Path Grid.Column="5"
Margin="4 0 0 0"
VerticalAlignment="Center"
Data="{StaticResource RightArrow}"
Data="{DynamicResource RightArrow}"
Fill="{DynamicResource MahApps.Brushes.RightArrowFill}" />
</Grid>
<Grid Margin="2 0 1 0">
Expand Down Expand Up @@ -454,14 +454,15 @@
</Grid.ColumnDefinitions>
<ContentPresenter x:Name="Icon"
Margin="1"
HorizontalAlignment="Center"
VerticalAlignment="Center"
ContentSource="Icon"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
<Path x:Name="GlyphPanel"
Margin="5 0 0 0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Data="{StaticResource Checkmark}"
Data="{DynamicResource Checkmark}"
Fill="{DynamicResource MahApps.Brushes.CheckmarkFill}"
FlowDirection="LeftToRight"
Visibility="Collapsed" />
Expand Down
3 changes: 2 additions & 1 deletion src/MahApps.Metro/Styles/VS/MenuItem.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,13 @@
Width="16"
Height="16"
Margin="1 1 0 0"
Data="{StaticResource Checkmark}"
Data="{DynamicResource Checkmark}"
Fill="{DynamicResource MahApps.Brushes.Menu.Checkmark.Fill}"
FlowDirection="LeftToRight" />
</Grid>
<ContentPresenter x:Name="Icon"
Grid.Column="0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
ContentSource="Icon" />
<ContentPresenter x:Name="HeaderHost"
Expand Down
4 changes: 4 additions & 0 deletions tools/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Cake" version="0.38.5" />
</packages>