Skip to content

Commit 9d6dc34

Browse files
KebooKeboo
committed
Fixes #746
Allowing the option for projects to opt-into having the font files copied locally rather than used as an embedded resource. No longer setting font for DailogHost No longer setting font for Toolbar.
1 parent ed34d70 commit 9d6dc34

8 files changed

+40
-10
lines changed

‎MaterialDesignColors.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1313
<description>ResourceDictionary instances containing standard Google Material Design swatches, for inclusion in a XAML application.</description>
1414
<releaseNotes>https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit/releases</releaseNotes>
15-
<copyright>Copyright 2015 James Willock/Mulholland Software Ltd</copyright>
15+
<copyright>Copyright 2019 James Willock/Mulholland Software Ltd</copyright>
1616
<tags>WPF XAML Material Design Colour Color UI UX</tags>
1717
</metadata>
1818
<files>

‎MaterialDesignThemes.MahApps.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1313
<description>ResourceDictionary instances containing Material Design templates and styles for WPF controls in the MahApps library.</description>
1414
<releaseNotes>https://github.com/MaterialDesignInXAML/MaterialDesignInXamlToolkit/releases</releaseNotes>
15-
<copyright>Copyright 2015 James Willock/Mulholland Software Ltd</copyright>
15+
<copyright>Copyright 2019 James Willock/Mulholland Software Ltd</copyright>
1616
<tags>WPF XAML MahApps Material Design Theme Colour Color UI UX</tags>
1717
<dependencies>
1818
<dependency id="MaterialDesignColors" version="[1.2.0, 2.0)" />

‎MaterialDesignThemes.Wpf/MaterialDesignFonts.cs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
using System;
2+
using System.IO;
3+
using System.Windows.Media;
4+
5+
namespace MaterialDesignThemes.Wpf
6+
{
7+
public static class MaterialDesignFonts
8+
{
9+
private static readonly Lazy<FontFamily> _roboto
10+
= new Lazy<FontFamily>(LoadRobotoFontFamily);
11+
12+
private static FontFamily LoadRobotoFontFamily()
13+
{
14+
string fontDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Resources", "Roboto");
15+
return new FontFamily(new Uri($"file:///{fontDirectory}"), "./#Roboto");
16+
}
17+
18+
public static FontFamily Roboto => _roboto.Value;
19+
}
20+
}

‎MaterialDesignThemes.Wpf/MaterialDesignThemes.Wpf.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@
1010
<Company>Mulholland Software/James Willock</Company>
1111
<Product>MaterialDesignColors.Wpf</Product>
1212
<Description>Material Design in XAML Toolkit - WPF Themes</Description>
13-
<Copyright>Copyright © 2015</Copyright>
13+
<Copyright>Copyright © 2019</Copyright>
1414
<Version>1.0.1</Version>
1515
<AssemblyVersion>1.0.1</AssemblyVersion>
1616
<NoWarn>CS1591;CS1574</NoWarn>
1717
<ExtrasEnableWpfProjectSetup>true</ExtrasEnableWpfProjectSetup>
1818
<Configurations>Debug;Release;AppVeyor</Configurations>
19+
<DocumentationFile>bin\$(Configuration)\MaterialDesignThemes.Wpf.xml</DocumentationFile>
1920
</PropertyGroup>
2021
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'AppVeyor|AnyCPU'">
2122
<OutputPath>bin\AppVeyor\</OutputPath>
@@ -24,7 +25,6 @@
2425
<DebugType>pdbonly</DebugType>
2526
<ErrorReport>prompt</ErrorReport>
2627
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
27-
<DocumentationFile>bin\AppVeyor\MaterialDesignThemes.Wpf.XML</DocumentationFile>
2828
</PropertyGroup>
2929
<Import Project="..\Versioning.targets" />
3030
<ItemGroup>

‎MaterialDesignThemes.Wpf/MaterialDesignThemes.targets

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<IncludeMaterialDesignFont Condition="$(IncludeMaterialDesignFont) == '' Or $(IncludeMaterialDesignFont) == '*Undefined*'">False</IncludeMaterialDesignFont>
5+
<MaterialDesignFontDirectory Condition="$(MaterialDesignFontDirectory) == '' Or $(MaterialDesignFontDirectory) == '*Undefined*'">Resources\Roboto\</MaterialDesignFontDirectory>
6+
</PropertyGroup>
7+
8+
<ItemGroup Condition="'$(IncludeMaterialDesignFont)' == 'True'">
9+
<None Include="$(MSBuildThisFileDirectory)Resources\Roboto\*.ttf">
10+
<Link>$(MaterialDesignFontDirectory)%(FileName)%(Extension)</Link>
11+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
12+
</None>
13+
</ItemGroup>
14+
</Project>

‎MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.DialogHost.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@
153153
TextOptions.TextRenderingMode="Auto"
154154
FocusManager.IsFocusScope="False"
155155
Foreground="{DynamicResource MaterialDesignBody}"
156-
FontFamily="{StaticResource MaterialDesignFont}"
157156
Focusable="True"
158157
IsTabStop="False"
159158
Opacity="0"

‎MaterialDesignThemes.Wpf/Themes/MaterialDesignTheme.ToolBar.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@
121121

122122
<Style x:Key="MaterialDesignToolBar" TargetType="{x:Type ToolBar}">
123123
<Setter Property="Background" Value="{DynamicResource MaterialDesignToolBarBackground}"/>
124-
<Setter Property="FontFamily" Value="{StaticResource MaterialDesignFont}"/>
125124
<Setter Property="Foreground" Value="{DynamicResource MaterialDesignBody}"/>
126125
<Setter Property="ClipToBounds" Value="True"/>
127126
<Setter Property="Template">

‎MaterialDesignThemes.nuspec

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,13 @@
1717
<dependencies>
1818
<dependency id="MaterialDesignColors" version="[1.2.0, 2.0)" />
1919
</dependencies>
20-
<contentFiles>
21-
<files include="MaterialDesignThemes.Wpf\bin\AppVeyor\net45\Resources\Roboto\*.ttf" buildAction="None" />
22-
</contentFiles>
2320
</metadata>
2421
<files>
2522
<file src="MaterialDesignThemes.Wpf\bin\AppVeyor\net45\MaterialDesignThemes.Wpf.dll" target="lib\net45" />
2623
<file src="MaterialDesignThemes.Wpf\bin\AppVeyor\net45\MaterialDesignThemes.Wpf.pdb" target="lib\net45" />
2724
<file src="MaterialDesignThemes.Wpf\bin\AppVeyor\net45\MaterialDesignThemes.Wpf.xml" target="lib\net45" />
28-
<file src="MaterialDesignThemes.Wpf\bin\AppVeyor\net45\Resources\Roboto\*.ttf" target="contentFiles" />
25+
<file src="MaterialDesignThemes.Wpf\bin\AppVeyor\net45\Resources\Roboto\*.ttf" target="build\Resources\Roboto" />
26+
<file src="MaterialDesignThemes.Wpf\MaterialDesignThemes.targets" target="build" />
2927
<file src="MaterialDesignThemes.Wpf\bin\AppVeyor\netcoreapp3.0\MaterialDesignThemes.Wpf.dll" target="lib\netcoreapp3.0" />
3028
<file src="MaterialDesignThemes.Wpf\bin\AppVeyor\netcoreapp3.0\MaterialDesignThemes.Wpf.pdb" target="lib\netcoreapp3.0" />
3129
<file src="MaterialDesignThemes.Wpf\bin\AppVeyor\netcoreapp3.0\MaterialDesignThemes.Wpf.xml" target="lib\netcoreapp3.0" />

0 commit comments

Comments
 (0)