diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config deleted file mode 100644 index 67f8ea046e..0000000000 --- a/.nuget/NuGet.Config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe deleted file mode 100644 index 9f8781de0d..0000000000 Binary files a/.nuget/NuGet.exe and /dev/null differ diff --git a/.nuget/NuGet.targets b/.nuget/NuGet.targets deleted file mode 100644 index 2c3545bc73..0000000000 --- a/.nuget/NuGet.targets +++ /dev/null @@ -1,151 +0,0 @@ - - - - $(MSBuildProjectDirectory)\..\ - - - false - - - false - - - true - - - false - - - - - - - - - - - $([System.IO.Path]::Combine($(SolutionDir), ".nuget")) - - - - - $(SolutionDir).nuget - - - - packages.$(MSBuildProjectName.Replace(' ', '_')).config - - - - - - $(PackagesProjectConfig) - - - - - packages.config - - - - - - - $(NuGetToolsPath)\NuGet.exe - @(PackageSource) - - "$(NuGetExePath)" - mono --runtime=v4.0.30319 $(NuGetExePath) - - $(TargetDir.Trim('\\')) - - -RequireConsent - -NonInteractive - - "$(SolutionDir) " - "$(SolutionDir)" - - - $(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir) - $(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols - - - - RestorePackages; - $(BuildDependsOn); - - - - - $(BuildDependsOn); - BuildPackage; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.paket/paket.bootstrapper.exe b/.paket/paket.bootstrapper.exe index 79d73316d8..c0406702cf 100644 Binary files a/.paket/paket.bootstrapper.exe and b/.paket/paket.bootstrapper.exe differ diff --git a/MahApps.Metro.Resources/MahApps.Metro.Resources.csproj b/MahApps.Metro.Resources/MahApps.Metro.Resources.csproj index 38b6d34237..39d03bd47f 100644 --- a/MahApps.Metro.Resources/MahApps.Metro.Resources.csproj +++ b/MahApps.Metro.Resources/MahApps.Metro.Resources.csproj @@ -87,4 +87,5 @@ --> + \ No newline at end of file diff --git a/MahApps.Metro.XAMLMagic.vssettings b/MahApps.Metro.XAMLMagic.vssettings new file mode 100644 index 0000000000..c0cef274e9 --- /dev/null +++ b/MahApps.Metro.XAMLMagic.vssettings @@ -0,0 +1 @@ +22TrueFalseFalseTrue01RadialGradientBrush, GradientStop, LinearGradientBrush, ScaleTransfom, SkewTransform, RotateTransform, TranslateTransform, Trigger, Condition, Setterx:Bind, BindingTrueFalseTrueTrueFalseTargetNameThenPropertyLastFalseDefaultFalse["x:Class","xmlns, xmlns:x","xmlns:*","x:Key, Key, x:Name, Name, x:Uid, Uid, Title","Grid.Row, Grid.RowSpan, Grid.Column, Grid.ColumnSpan, Canvas.Left, Canvas.Top, Canvas.Right, Canvas.Bottom","Width, Height, MinWidth, MinHeight, MaxWidth, MaxHeight","Margin, Padding, HorizontalAlignment, VerticalAlignment, HorizontalContentAlignment, VerticalContentAlignment, Panel.ZIndex","Style, Background, Foreground, Fill, BorderBrush, BorderThickness, Stroke, StrokeThickness, Opacity","FontFamily, FontSize, LineHeight, FontWeight, FontStyle, FontStretch","*:*, *","PageSource, PageIndex, Offset, Color, TargetName, Property, Value, StartPoint, EndPoint, ElementName, RelativeSource, Source, Path, XPath, IsAsync, Mode, Converter, ConverterParameter, ConverterCulture, UpdateSourceTrigger, NotifyOnSourceUpdated, NotifyOnTargetUpdated, NotifyOnValidationError, ValidatesOnDataErrors, ValidatesOnNotifyDataErrors, ValidatesOnExceptions","mc:Ignorable, d:IsDataSource, d:IsHidden, d:LayoutOverrides, d:IsStaticText, d:DesignHeight, d:DesignWidth, d:DataContext, d:DesignSource"]TrueMargin, Padding, BorderThickness, ThumbnailClipMarginSpace \ No newline at end of file diff --git a/MahApps.Metro.XAMLStyler.vssettings b/MahApps.Metro.XAMLStyler.vssettings new file mode 100644 index 0000000000..c423c60249 --- /dev/null +++ b/MahApps.Metro.XAMLStyler.vssettings @@ -0,0 +1 @@ +HorizontalAlignment, VerticalAlignment, HorizontalContentAlignment, VerticalContentAlignment, Panel.ZIndexGrid.Row, Grid.RowSpan, Grid.Column, Grid.ColumnSpan, Canvas.Left, Canvas.Top, Canvas.Right, Canvas.Bottommc:Ignorable, d:IsDataSource, d:IsHidden, d:LayoutOverrides, d:IsStaticText, d:DesignHeight, d:DesignWidth, d:DataContext, d:DesignSourcex:ClassWidth, Height, MinWidth, MinHeight, MaxWidth, MaxHeight, Margin, PaddingKey, x:Key, Uid, x:UidName, x:Name, TitlePageSource, PageIndex, Offset, Color, TargetName, Property, Value, StartPoint, EndPoint, ElementName, RelativeSource, Source, Path, XPath, IsAsync, Mode, Converter, ConverterParameter, ConverterCulture, UpdateSourceTrigger, NotifyOnSourceUpdated, NotifyOnTargetUpdated, NotifyOnValidationError, ValidatesOnDataErrors, ValidatesOnNotifyDataErrors, ValidatesOnExceptionsxmlns, xmlns:x2FalseFalseTrueTrueTrue01RadialGradientBrush, GradientStop, LinearGradientBrush, ScaleTransfom, SkewTransform, RotateTransform, TranslateTransform, Trigger, Condition, SetterTrueFalseFalseTrueTrueFalseTargetNameThenPropertyDefaultTrue \ No newline at end of file diff --git a/MahApps.Metro.sln b/MahApps.Metro.sln index 180107ac5d..096e82ccbb 100644 --- a/MahApps.Metro.sln +++ b/MahApps.Metro.sln @@ -3,6 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 VisualStudioVersion = 12.0.40629.0 MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{5FEFAEC4-5A45-480B-903A-9E0B5F5B913D}" + ProjectSection(SolutionItems) = preProject + paket.dependencies = paket.dependencies + EndProjectSection +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MahApps.Metro", "MahApps.Metro\MahApps.Metro.csproj", "{5B1710D2-5DC8-4754-91B2-19165DE49B3D}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MetroDemo", "samples\MetroDemo\MetroDemo.csproj", "{56E8080F-FFEB-47CD-ADB9-92245F92565B}" @@ -24,13 +29,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MetroDemo.NET45", "samples\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Caliburn.Metro.Demo", "samples\Caliburn.Metro.Demo\Caliburn.Metro.Demo.csproj", "{9F9B7559-E8B6-43C3-BEE8-9A977BACE0FB}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{4166BE4A-2746-40AA-B38B-70D7C3054C37}" - ProjectSection(SolutionItems) = preProject - .nuget\NuGet.Config = .nuget\NuGet.Config - .nuget\NuGet.exe = .nuget\NuGet.exe - .nuget\NuGet.targets = .nuget\NuGet.targets - EndProjectSection -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MahApps.Metro.Tests", "Mahapps.Metro.Tests\MahApps.Metro.Tests.csproj", "{4B381135-F480-478E-9635-B76A425670B7}" ProjectSection(ProjectDependencies) = postProject {5B1710D2-5DC8-4754-91B2-19165DE49B3D} = {5B1710D2-5DC8-4754-91B2-19165DE49B3D} diff --git a/MahApps.Metro/Controls/GlowWindow.xaml b/MahApps.Metro/Controls/GlowWindow.xaml index 36d8472880..138ea2275f 100644 --- a/MahApps.Metro/Controls/GlowWindow.xaml +++ b/MahApps.Metro/Controls/GlowWindow.xaml @@ -2,25 +2,28 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:metro="clr-namespace:MahApps.Metro.Controls" + x:Name="glowWindow" Title="GlowWindow" Width="300" Height="300" - WindowStyle="None" Background="Transparent" - ShowActivated="False" + Opacity="0" ResizeMode="NoResize" + ShowActivated="False" SnapsToDevicePixels="True" - Opacity="0" - x:Name="glowWindow"> + WindowStyle="None"> + - + - + Create() {PackIconMaterialKind.Details, "M6.38,6H17.63L12,16L6.38,6M3,4L12,20L21,4H3Z"}, {PackIconMaterialKind.Deviantart, "M6,6H12L14,2H18V6L14.5,13H18V18H12L10,22H6V18L9.5,11H6V6Z"}, {PackIconMaterialKind.Diamond, "M16,9H19L14,16M10,9H14L12,17M5,9H8L10,16M15,4H17L19,7H16M11,4H13L14,7H10M7,4H9L8,7H5M6,2L2,8L12,22L22,8L18,2H6Z"}, - {PackIconMaterialKind.Dice, "M21,16.5C21,16.88 20.79,17.21 20.47,17.38L12.57,21.82C12.41,21.94 12.21,22 12,22C11.79,22 11.59,21.94 11.43,21.82L3.53,17.38C3.21,17.21 3,16.88 3,16.5V7.5C3,7.12 3.21,6.79 3.53,6.62L11.43,2.18C11.59,2.06 11.79,2 12,2C12.21,2 12.41,2.06 12.57,2.18L20.47,6.62C20.79,6.79 21,7.12 21,7.5V16.5M5.5,14.32C4.95,14 4.5,14.2 4.5,14.75C4.5,15.3 4.95,16 5.5,16.32C6.05,16.63 6.5,16.43 6.5,15.88C6.5,15.33 6.05,14.63 5.5,14.32M5.5,10.32C4.95,10 4.5,10.2 4.5,10.75C4.5,11.3 4.95,12 5.5,12.32C6.05,12.63 6.5,12.43 6.5,11.88C6.5,11.33 6.05,10.63 5.5,10.32M9.5,16.58C8.95,16.27 8.5,16.46 8.5,17C8.5,17.57 8.95,18.27 9.5,18.58C10.05,18.89 10.5,18.7 10.5,18.15C10.5,17.59 10.05,16.89 9.5,16.58M7.5,13.45C6.95,13.14 6.5,13.33 6.5,13.88C6.5,14.43 6.95,15.14 7.5,15.45C8.05,15.76 8.5,15.57 8.5,15C8.5,14.46 8.05,13.76 7.5,13.45M9.5,12.58C8.95,12.27 8.5,12.46 8.5,13C8.5,13.57 8.95,14.27 9.5,14.58C10.05,14.89 10.5,14.7 10.5,14.15C10.5,13.59 10.05,12.89 9.5,12.58M18.5,14.32C17.95,14.63 17.5,15.33 17.5,15.88C17.5,16.43 17.95,16.63 18.5,16.32C19.05,16 19.5,15.3 19.5,14.75C19.5,14.2 19.05,14 18.5,14.32M18.5,10.32C17.95,10.63 17.5,11.33 17.5,11.88C17.5,12.43 17.95,12.63 18.5,12.32C19.05,12 19.5,11.3 19.5,10.75C19.5,10.2 19.05,10 18.5,10.32M14.5,16.58C13.95,16.89 13.5,17.59 13.5,18.15C13.5,18.7 13.95,18.89 14.5,18.58C15.05,18.27 15.5,17.57 15.5,17C15.5,16.46 15.05,16.27 14.5,16.58M14.5,12.58C13.95,12.89 13.5,13.59 13.5,14.15C13.5,14.7 13.95,14.89 14.5,14.58C15.05,14.27 15.5,13.57 15.5,13C15.5,12.46 15.05,12.27 14.5,12.58M16.5,7.77C17.04,7.45 17.09,6.96 16.62,6.69C16.14,6.41 15.31,6.45 14.76,6.77C14.21,7.09 14.16,7.58 14.64,7.85C15.11,8.13 15.95,8.09 16.5,7.77M9.07,8.1C9.61,7.78 9.67,7.3 9.19,7C8.71,6.74 7.88,6.78 7.34,7.1C6.79,7.43 6.73,7.91 7.21,8.19C7.69,8.46 8.5,8.43 9.07,8.1M12.78,7.94C13.33,7.61 13.38,7.13 12.9,6.85C12.43,6.58 11.59,6.61 11.05,6.94C10.5,7.26 10.45,7.74 10.92,8C11.4,8.3 12.23,8.26 12.78,7.94Z"}, {PackIconMaterialKind.Dice1, "M5,3H19A2,2 0 0,1 21,5V19A2,2 0 0,1 19,21H5A2,2 0 0,1 3,19V5A2,2 0 0,1 5,3M12,10A2,2 0 0,0 10,12A2,2 0 0,0 12,14A2,2 0 0,0 14,12A2,2 0 0,0 12,10Z"}, {PackIconMaterialKind.Dice2, "M5,3H19A2,2 0 0,1 21,5V19A2,2 0 0,1 19,21H5A2,2 0 0,1 3,19V5A2,2 0 0,1 5,3M7,5A2,2 0 0,0 5,7A2,2 0 0,0 7,9A2,2 0 0,0 9,7A2,2 0 0,0 7,5M17,15A2,2 0 0,0 15,17A2,2 0 0,0 17,19A2,2 0 0,0 19,17A2,2 0 0,0 17,15Z"}, {PackIconMaterialKind.Dice3, "M5,3H19A2,2 0 0,1 21,5V19A2,2 0 0,1 19,21H5A2,2 0 0,1 3,19V5A2,2 0 0,1 5,3M12,10A2,2 0 0,0 10,12A2,2 0 0,0 12,14A2,2 0 0,0 14,12A2,2 0 0,0 12,10M7,5A2,2 0 0,0 5,7A2,2 0 0,0 7,9A2,2 0 0,0 9,7A2,2 0 0,0 7,5M17,15A2,2 0 0,0 15,17A2,2 0 0,0 17,19A2,2 0 0,0 19,17A2,2 0 0,0 17,15Z"}, {PackIconMaterialKind.Dice4, "M5,3H19A2,2 0 0,1 21,5V19A2,2 0 0,1 19,21H5A2,2 0 0,1 3,19V5A2,2 0 0,1 5,3M7,5A2,2 0 0,0 5,7A2,2 0 0,0 7,9A2,2 0 0,0 9,7A2,2 0 0,0 7,5M17,15A2,2 0 0,0 15,17A2,2 0 0,0 17,19A2,2 0 0,0 19,17A2,2 0 0,0 17,15M17,5A2,2 0 0,0 15,7A2,2 0 0,0 17,9A2,2 0 0,0 19,7A2,2 0 0,0 17,5M7,15A2,2 0 0,0 5,17A2,2 0 0,0 7,19A2,2 0 0,0 9,17A2,2 0 0,0 7,15Z"}, {PackIconMaterialKind.Dice5, "M5,3H19A2,2 0 0,1 21,5V19A2,2 0 0,1 19,21H5A2,2 0 0,1 3,19V5A2,2 0 0,1 5,3M7,5A2,2 0 0,0 5,7A2,2 0 0,0 7,9A2,2 0 0,0 9,7A2,2 0 0,0 7,5M17,15A2,2 0 0,0 15,17A2,2 0 0,0 17,19A2,2 0 0,0 19,17A2,2 0 0,0 17,15M17,5A2,2 0 0,0 15,7A2,2 0 0,0 17,9A2,2 0 0,0 19,7A2,2 0 0,0 17,5M12,10A2,2 0 0,0 10,12A2,2 0 0,0 12,14A2,2 0 0,0 14,12A2,2 0 0,0 12,10M7,15A2,2 0 0,0 5,17A2,2 0 0,0 7,19A2,2 0 0,0 9,17A2,2 0 0,0 7,15Z"}, {PackIconMaterialKind.Dice6, "M5,3H19A2,2 0 0,1 21,5V19A2,2 0 0,1 19,21H5A2,2 0 0,1 3,19V5A2,2 0 0,1 5,3M7,5A2,2 0 0,0 5,7A2,2 0 0,0 7,9A2,2 0 0,0 9,7A2,2 0 0,0 7,5M17,15A2,2 0 0,0 15,17A2,2 0 0,0 17,19A2,2 0 0,0 19,17A2,2 0 0,0 17,15M17,10A2,2 0 0,0 15,12A2,2 0 0,0 17,14A2,2 0 0,0 19,12A2,2 0 0,0 17,10M17,5A2,2 0 0,0 15,7A2,2 0 0,0 17,9A2,2 0 0,0 19,7A2,2 0 0,0 17,5M7,10A2,2 0 0,0 5,12A2,2 0 0,0 7,14A2,2 0 0,0 9,12A2,2 0 0,0 7,10M7,15A2,2 0 0,0 5,17A2,2 0 0,0 7,19A2,2 0 0,0 9,17A2,2 0 0,0 7,15Z"}, + {PackIconMaterialKind.DiceD20, "M21,16.5C21,16.88 20.79,17.21 20.47,17.38L12.57,21.82C12.41,21.94 12.21,22 12,22C11.79,22 11.59,21.94 11.43,21.82L3.53,17.38C3.21,17.21 3,16.88 3,16.5V7.5C3,7.12 3.21,6.79 3.53,6.62L11.43,2.18C11.59,2.06 11.79,2 12,2C12.21,2 12.41,2.06 12.57,2.18L20.47,6.62C20.79,6.79 21,7.12 21,7.5V16.5M12,4.15L5,8.09V15.91L12,19.85L19,15.91V8.09L12,4.15M14.93,8.27A2.57,2.57 0 0,1 17.5,10.84V13.5C17.5,14.9 16.35,16.05 14.93,16.05C13.5,16.05 12.36,14.9 12.36,13.5V10.84A2.57,2.57 0 0,1 14.93,8.27M14.92,9.71C14.34,9.71 13.86,10.18 13.86,10.77V13.53C13.86,14.12 14.34,14.6 14.92,14.6C15.5,14.6 16,14.12 16,13.53V10.77C16,10.18 15.5,9.71 14.92,9.71M11.45,14.76V15.96L6.31,15.93V14.91C6.31,14.91 9.74,11.58 9.75,10.57C9.75,9.33 8.73,9.46 8.73,9.46C8.73,9.46 7.75,9.5 7.64,10.71L6.14,10.76C6.14,10.76 6.18,8.26 8.83,8.26C11.2,8.26 11.23,10.04 11.23,10.5C11.23,12.18 8.15,14.77 8.15,14.77L11.45,14.76Z"}, + {PackIconMaterialKind.DiceD4, "M13.43,15.15H14.29V16.36H13.43V18H11.92V16.36H8.82L8.75,15.41L11.91,10.42H13.43V15.15M10.25,15.15H11.92V12.47L10.25,15.15M22,21H2C1.64,21 1.31,20.81 1.13,20.5C0.95,20.18 0.96,19.79 1.15,19.5L11.15,3C11.5,2.38 12.5,2.38 12.86,3L22.86,19.5C23.04,19.79 23.05,20.18 22.87,20.5C22.69,20.81 22.36,21 22,21M3.78,19H20.23L12,5.43L3.78,19Z"}, + {PackIconMaterialKind.DiceD6, "M5,3H19A2,2 0 0,1 21,5V19A2,2 0 0,1 19,21H5A2,2 0 0,1 3,19V5A2,2 0 0,1 5,3M5,5V19H19V5H5M13.39,9.53C10.89,9.5 10.86,11.53 10.86,11.53C10.86,11.53 11.41,10.87 12.53,10.87C13.19,10.87 14.5,11.45 14.55,13.41C14.61,15.47 12.77,16 12.77,16C12.77,16 9.27,16.86 9.3,12.66C9.33,7.94 13.39,8.33 13.39,8.33V9.53M11.95,12.1C11.21,12 10.83,12.78 10.83,12.78L10.85,13.5C10.85,14.27 11.39,14.83 12,14.83C12.61,14.83 13.05,14.27 13.05,13.5C13.05,12.73 12.56,12.1 11.95,12.1Z"}, + {PackIconMaterialKind.DiceD8, "M12,23C11.67,23 11.37,22.84 11.18,22.57L4.18,12.57C3.94,12.23 3.94,11.77 4.18,11.43L11.18,1.43C11.55,0.89 12.45,0.89 12.82,1.43L19.82,11.43C20.06,11.77 20.06,12.23 19.82,12.57L12.82,22.57C12.63,22.84 12.33,23 12,23M6.22,12L12,20.26L17.78,12L12,3.74L6.22,12M12,8.25C13.31,8.25 14.38,9.2 14.38,10.38C14.38,11.07 14,11.68 13.44,12.07C14.14,12.46 14.6,13.13 14.6,13.9C14.6,15.12 13.44,16.1 12,16.1C10.56,16.1 9.4,15.12 9.4,13.9C9.4,13.13 9.86,12.46 10.56,12.07C10,11.68 9.63,11.07 9.63,10.38C9.63,9.2 10.69,8.25 12,8.25M12,12.65A1.1,1.1 0 0,0 10.9,13.75A1.1,1.1 0 0,0 12,14.85A1.1,1.1 0 0,0 13.1,13.75A1.1,1.1 0 0,0 12,12.65M12,9.5C11.5,9.5 11.1,9.95 11.1,10.5C11.1,11.05 11.5,11.5 12,11.5C12.5,11.5 12.9,11.05 12.9,10.5C12.9,9.95 12.5,9.5 12,9.5Z"}, {PackIconMaterialKind.Directions, "M14,14.5V12H10V15H8V11A1,1 0 0,1 9,10H14V7.5L17.5,11M21.71,11.29L12.71,2.29H12.7C12.31,1.9 11.68,1.9 11.29,2.29L2.29,11.29C1.9,11.68 1.9,12.32 2.29,12.71L11.29,21.71C11.68,22.09 12.31,22.1 12.71,21.71L21.71,12.71C22.1,12.32 22.1,11.68 21.71,11.29Z"}, {PackIconMaterialKind.DiskAlert, "M10,14C8.89,14 8,13.1 8,12C8,10.89 8.89,10 10,10A2,2 0 0,1 12,12A2,2 0 0,1 10,14M10,4A8,8 0 0,0 2,12A8,8 0 0,0 10,20A8,8 0 0,0 18,12A8,8 0 0,0 10,4M20,12H22V7H20M20,16H22V14H20V16Z"}, {PackIconMaterialKind.Disqus, "M12.08,22C9.63,22 7.39,21.11 5.66,19.63L1.41,20.21L3.05,16.15C2.5,14.88 2.16,13.5 2.16,12C2.16,6.5 6.6,2 12.08,2C17.56,2 22,6.5 22,12C22,17.5 17.56,22 12.08,22M17.5,11.97V11.94C17.5,9.06 15.46,7 11.95,7H8.16V17H11.9C15.43,17 17.5,14.86 17.5,11.97M12,14.54H10.89V9.46H12C13.62,9.46 14.7,10.39 14.7,12V12C14.7,13.63 13.62,14.54 12,14.54Z"}, diff --git a/MahApps.Metro/Controls/IconPacks/PackIconMaterialKind.cs b/MahApps.Metro/Controls/IconPacks/PackIconMaterialKind.cs index 84a2fc91eb..8f53b9702f 100644 --- a/MahApps.Metro/Controls/IconPacks/PackIconMaterialKind.cs +++ b/MahApps.Metro/Controls/IconPacks/PackIconMaterialKind.cs @@ -471,13 +471,16 @@ public enum PackIconMaterialKind Details, Deviantart, Diamond, - Dice, Dice1, Dice2, Dice3, Dice4, Dice5, Dice6, + DiceD20, + DiceD4, + DiceD6, + DiceD8, Directions, DiskAlert, Disqus, diff --git a/MahApps.Metro/Controls/RevealImage.xaml b/MahApps.Metro/Controls/RevealImage.xaml index 45f9c8b7d1..9f08584766 100644 --- a/MahApps.Metro/Controls/RevealImage.xaml +++ b/MahApps.Metro/Controls/RevealImage.xaml @@ -1,62 +1,73 @@  - + mc:Ignorable="d" + d:DesignHeight="300" + d:DesignWidth="300"> + - + - + - + - - + + - - + + - - + + - - + - + - + - - - + + + - - - + + + - + diff --git a/MahApps.Metro/Converters/NullToUnsetValueConverter.cs b/MahApps.Metro/Converters/NullToUnsetValueConverter.cs new file mode 100644 index 0000000000..703ec6135f --- /dev/null +++ b/MahApps.Metro/Converters/NullToUnsetValueConverter.cs @@ -0,0 +1,32 @@ +using System; +using System.Globalization; +using System.Windows; + +namespace MahApps.Metro.Converters +{ + public class NullToUnsetValueConverter : MarkupConverter + { + private static NullToUnsetValueConverter _instance; + + // Explicit static constructor to tell C# compiler + // not to mark type as beforefieldinit + static NullToUnsetValueConverter() + { + } + + public override object ProvideValue(IServiceProvider serviceProvider) + { + return _instance ?? (_instance = new NullToUnsetValueConverter()); + } + + protected override object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + return value ?? DependencyProperty.UnsetValue; + } + + protected override object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + return DependencyProperty.UnsetValue; + } + } +} \ No newline at end of file diff --git a/MahApps.Metro/MahApps.Metro.NET45.csproj b/MahApps.Metro/MahApps.Metro.NET45.csproj index f456efa5bc..1c8cb95752 100644 --- a/MahApps.Metro/MahApps.Metro.NET45.csproj +++ b/MahApps.Metro/MahApps.Metro.NET45.csproj @@ -227,6 +227,7 @@ + @@ -790,4 +791,16 @@ --> + + + + + + ..\packages\JetBrains.Annotations\lib\net20\JetBrains.Annotations.dll + True + True + + + + \ No newline at end of file diff --git a/MahApps.Metro/MahApps.Metro.csproj b/MahApps.Metro/MahApps.Metro.csproj index 145c5cb1be..65185a6009 100644 --- a/MahApps.Metro/MahApps.Metro.csproj +++ b/MahApps.Metro/MahApps.Metro.csproj @@ -178,6 +178,7 @@ + @@ -758,4 +759,16 @@ --> + + + + + + ..\packages\JetBrains.Annotations\lib\net20\JetBrains.Annotations.dll + True + True + + + + \ No newline at end of file diff --git a/MahApps.Metro/Styles/Clean/Clean.xaml b/MahApps.Metro/Styles/Clean/Clean.xaml index a0d3dd7da7..bc113e9853 100644 --- a/MahApps.Metro/Styles/Clean/Clean.xaml +++ b/MahApps.Metro/Styles/Clean/Clean.xaml @@ -1,7 +1,7 @@  - + @@ -10,10 +10,10 @@ - diff --git a/MahApps.Metro/Styles/Clean/CleanStatusBar.xaml b/MahApps.Metro/Styles/Clean/CleanStatusBar.xaml index f9e4656cd7..ee3e8b3bf5 100644 --- a/MahApps.Metro/Styles/Clean/CleanStatusBar.xaml +++ b/MahApps.Metro/Styles/Clean/CleanStatusBar.xaml @@ -8,15 +8,13 @@ \ No newline at end of file diff --git a/MahApps.Metro/Styles/Clean/CleanWindow.xaml b/MahApps.Metro/Styles/Clean/CleanWindow.xaml index 5318099712..6caa23ae37 100644 --- a/MahApps.Metro/Styles/Clean/CleanWindow.xaml +++ b/MahApps.Metro/Styles/Clean/CleanWindow.xaml @@ -2,18 +2,12 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:Controls="clr-namespace:MahApps.Metro.Controls"> - \ No newline at end of file diff --git a/MahApps.Metro/Styles/Clean/CleanWindowButtonCommands.xaml b/MahApps.Metro/Styles/Clean/CleanWindowButtonCommands.xaml index 3d75fd1ce0..e22feebe0f 100644 --- a/MahApps.Metro/Styles/Clean/CleanWindowButtonCommands.xaml +++ b/MahApps.Metro/Styles/Clean/CleanWindowButtonCommands.xaml @@ -6,12 +6,9 @@ - \ No newline at end of file diff --git a/MahApps.Metro/Styles/Clean/CleanWindowButtons.xaml b/MahApps.Metro/Styles/Clean/CleanWindowButtons.xaml index 5841f608e7..f69c355cc1 100644 --- a/MahApps.Metro/Styles/Clean/CleanWindowButtons.xaml +++ b/MahApps.Metro/Styles/Clean/CleanWindowButtons.xaml @@ -5,82 +5,62 @@ - + - + - + - + diff --git a/MahApps.Metro/Styles/Clean/CleanWindowCommands.xaml b/MahApps.Metro/Styles/Clean/CleanWindowCommands.xaml index 2d2ee5a213..466670bce0 100644 --- a/MahApps.Metro/Styles/Clean/CleanWindowCommands.xaml +++ b/MahApps.Metro/Styles/Clean/CleanWindowCommands.xaml @@ -2,14 +2,10 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:Controls="clr-namespace:MahApps.Metro.Controls"> - \ No newline at end of file diff --git a/MahApps.Metro/Styles/Controls.AnimatedSingleRowTabControl.xaml b/MahApps.Metro/Styles/Controls.AnimatedSingleRowTabControl.xaml index 91e0fe3804..3217cbeb1d 100644 --- a/MahApps.Metro/Styles/Controls.AnimatedSingleRowTabControl.xaml +++ b/MahApps.Metro/Styles/Controls.AnimatedSingleRowTabControl.xaml @@ -1,39 +1,31 @@  + xmlns:Behaviours="clr-namespace:MahApps.Metro.Behaviours" + xmlns:Controls="clr-namespace:MahApps.Metro.Controls"> - + - + - + IsEnabled="{TemplateBinding IsMouseOver}"> - + IsEnabled="{TemplateBinding IsMouseOver}"> - - - - + + + SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" /> - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - + + - - - - - diff --git a/MahApps.Metro/Styles/Controls.Calendar.xaml b/MahApps.Metro/Styles/Controls.Calendar.xaml index 4123393c18..818e852a21 100644 --- a/MahApps.Metro/Styles/Controls.Calendar.xaml +++ b/MahApps.Metro/Styles/Controls.Calendar.xaml @@ -1,24 +1,47 @@  - - - - @@ -347,34 +298,34 @@ HorizontalAlignment="Stretch" Background="{DynamicResource AccentColorBrush}"> - - + + + SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"> @@ -156,9 +149,9 @@ @@ -166,71 +159,56 @@ diff --git a/MahApps.Metro/Themes/FlipView.xaml b/MahApps.Metro/Themes/FlipView.xaml index 7d1bd7b7f1..60f5a495fc 100644 --- a/MahApps.Metro/Themes/FlipView.xaml +++ b/MahApps.Metro/Themes/FlipView.xaml @@ -2,11 +2,10 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:Controls="clr-namespace:MahApps.Metro.Controls"> - + + HorizontalAlignment="Stretch" + VerticalAlignment="Stretch"> @@ -14,82 +13,81 @@ BorderBrush="Transparent" BorderThickness="4"> - + - - + IsTabStop="False" /> @@ -97,123 +95,93 @@ - - + + - + - + - - + + - - + + - - + Storyboard.TargetProperty="Height" + To="30.0" /> - + Storyboard.TargetProperty="Height" + To="0.0" /> - + Storyboard.TargetProperty="Opacity" + To="0.0" /> - + Storyboard.TargetProperty="Opacity" + To="1.0" /> + \ No newline at end of file diff --git a/MahApps.Metro/Themes/Flyout.xaml b/MahApps.Metro/Themes/Flyout.xaml index 15ea7d4bbe..c5d52016bf 100644 --- a/MahApps.Metro/Themes/Flyout.xaml +++ b/MahApps.Metro/Themes/Flyout.xaml @@ -1,8 +1,8 @@ + xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"> @@ -10,28 +10,26 @@ - + - + Text="{Binding}" + Visibility="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:Flyout}}, Path=TitleVisibility}" /> - - - - - + + + + + - - - + + + - - - + + + @@ -110,68 +92,80 @@ - + + + + + + + + - + + KeyTime="00:00:00.750" + Value="0" /> - + + KeyTime="00:00:00.750" + Value="0" /> - + + KeyTime="00:00:00.750" + Value="0" /> - + + KeyTime="00:00:00.750" + Value="0" /> - + + KeyTime="00:00:00.750" + Value="0" /> - + @@ -179,112 +173,68 @@ - + Storyboard.TargetName="root" + Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)"> + - + Storyboard.TargetName="root" + Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.Y)"> + - + Storyboard.TargetName="root" + Storyboard.TargetProperty="(UIElement.Opacity)"> + - + Storyboard.TargetName="root" + Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.X)"> + - + Storyboard.TargetName="root" + Storyboard.TargetProperty="(UIElement.RenderTransform).(TranslateTransform.Y)"> + - + Storyboard.TargetName="root" + Storyboard.TargetProperty="(UIElement.Opacity)"> + - - - - - - - - - - + + + - - - - + + + + diff --git a/MahApps.Metro/Themes/Generic.xaml b/MahApps.Metro/Themes/Generic.xaml index 44ff768153..dbf01b5b26 100644 --- a/MahApps.Metro/Themes/Generic.xaml +++ b/MahApps.Metro/Themes/Generic.xaml @@ -37,13 +37,13 @@ diff --git a/MahApps.Metro/Themes/HotKeyBox.xaml b/MahApps.Metro/Themes/HotKeyBox.xaml index 3f1d947526..4580fd8978 100644 --- a/MahApps.Metro/Themes/HotKeyBox.xaml +++ b/MahApps.Metro/Themes/HotKeyBox.xaml @@ -2,34 +2,34 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:Controls="clr-namespace:MahApps.Metro.Controls" xmlns:Converters="clr-namespace:MahApps.Metro.Converters"> + - + \ No newline at end of file diff --git a/MahApps.Metro/Themes/NumericUpDown.xaml b/MahApps.Metro/Themes/NumericUpDown.xaml index f4ae1c04cb..5ce3f49b44 100644 --- a/MahApps.Metro/Themes/NumericUpDown.xaml +++ b/MahApps.Metro/Themes/NumericUpDown.xaml @@ -10,149 +10,126 @@ - - - - - - - - - Visible - - - - - - - - - - - - - - - Visible - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Visibility="Collapsed"> @@ -307,10 +49,10 @@ @@ -318,10 +60,10 @@ @@ -329,10 +71,10 @@ @@ -340,26 +82,234 @@ - + + + + + + + + + Visible + + + + + + + + + + + + + + + Visible + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MahApps.Metro/Themes/RangeSlider.xaml b/MahApps.Metro/Themes/RangeSlider.xaml index 1eb5a58934..76ff70d582 100644 --- a/MahApps.Metro/Themes/RangeSlider.xaml +++ b/MahApps.Metro/Themes/RangeSlider.xaml @@ -2,43 +2,41 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:controls="clr-namespace:MahApps.Metro.Controls"> - + + VerticalAlignment="Center" + Orientation="Vertical"> - + VerticalAlignment="Center" + Background="Transparent" + Orientation="Horizontal"> + + Height="{DynamicResource HorizontalThumbHeight}" + Style="{DynamicResource HorizontalSliderThumb}" + Cursor="Arrow" /> + MinWidth="{TemplateBinding MinRangeWidth}" + Cursor="Hand"> diff --git a/MahApps.Metro/Themes/SplitButton.xaml b/MahApps.Metro/Themes/SplitButton.xaml index ff4cfc99ed..d2de38fbbc 100644 --- a/MahApps.Metro/Themes/SplitButton.xaml +++ b/MahApps.Metro/Themes/SplitButton.xaml @@ -2,13 +2,12 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:Controls="clr-namespace:MahApps.Metro.Controls"> - + + SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" + UseLayoutRounding="True"> @@ -16,64 +15,64 @@ - + ItemStringFormat="{TemplateBinding ItemStringFormat}" + ItemTemplate="{TemplateBinding ItemTemplate}" + ItemTemplateSelector="{TemplateBinding ItemTemplateSelector}" + ItemsSource="{TemplateBinding ItemsSource}" + SelectedIndex="{Binding SelectedIndex, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" + SelectedItem="{Binding SelectedItem, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" + SelectionMode="Single" /> - + + SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" + UseLayoutRounding="True"> @@ -133,64 +131,64 @@ - + ItemStringFormat="{TemplateBinding ItemStringFormat}" + ItemTemplate="{TemplateBinding ItemTemplate}" + ItemTemplateSelector="{TemplateBinding ItemTemplateSelector}" + ItemsSource="{TemplateBinding ItemsSource}" + SelectedIndex="{Binding SelectedIndex, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" + SelectedItem="{Binding SelectedItem, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" + SelectionMode="Single" /> @@ -241,9 +239,9 @@ @@ -251,65 +249,38 @@ diff --git a/MahApps.Metro/Themes/Thumb.xaml b/MahApps.Metro/Themes/Thumb.xaml index ec2c600abe..00ebfa7515 100644 --- a/MahApps.Metro/Themes/Thumb.xaml +++ b/MahApps.Metro/Themes/Thumb.xaml @@ -1,7 +1,7 @@  - + diff --git a/MahApps.Metro/Themes/ToggleSwitch.xaml b/MahApps.Metro/Themes/ToggleSwitch.xaml index 2e2f0061b8..96b96aad4b 100644 --- a/MahApps.Metro/Themes/ToggleSwitch.xaml +++ b/MahApps.Metro/Themes/ToggleSwitch.xaml @@ -3,28 +3,17 @@ xmlns:Controls="clr-namespace:MahApps.Metro.Controls"> \ No newline at end of file diff --git a/MahApps.Metro/Themes/WindowCommands.xaml b/MahApps.Metro/Themes/WindowCommands.xaml index 66ab19dc95..8d2eb91f0d 100644 --- a/MahApps.Metro/Themes/WindowCommands.xaml +++ b/MahApps.Metro/Themes/WindowCommands.xaml @@ -2,143 +2,99 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:Controls="clr-namespace:MahApps.Metro.Controls"> - - + + SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" /> - - - + + - - - + + SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" /> - - - + + - - + + - - - + - - - + - - @@ -147,54 +103,41 @@ \ No newline at end of file diff --git a/MahApps.Metro/paket.references b/MahApps.Metro/paket.references index 9b0951d370..40ba8f2717 100644 --- a/MahApps.Metro/paket.references +++ b/MahApps.Metro/paket.references @@ -1 +1,2 @@ +JetBrains.Annotations File:PackIconBase.cs ControlzEx diff --git a/Mahapps.Metro.Tests/ButtonWindow.xaml b/Mahapps.Metro.Tests/ButtonWindow.xaml index 0c124e1650..5edd1d8cc1 100644 --- a/Mahapps.Metro.Tests/ButtonWindow.xaml +++ b/Mahapps.Metro.Tests/ButtonWindow.xaml @@ -1,14 +1,16 @@  + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:controls="http://metro.mahapps.com/winfx/xaml/controls" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + mc:Ignorable="d" + d:DesignHeight="300" + d:DesignWidth="300"> @@ -158,8 +146,7 @@ Height="20" Fill="{Binding Path=Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Button}}}"> - + @@ -171,36 +158,30 @@ HorizontalAlignment="Center"> - - - -