XIVChat
/
XIVChat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore(desktop): move font

This commit is contained in:
Anna 2020-11-14 23:09:50 -05:00
parent 0637b7e516
commit bcbab4dec0
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XIVChat Desktop/Export.xaml
View File

@ -46,7 +46,7 @@
<ItemsControl.ItemTemplate>
<DataTemplate>
<cc:MessageTextBlock FontFamily="Global User Interface, /fonts/#XIV AXIS Std ATK"
<cc:MessageTextBlock FontFamily="Global User Interface, /Resources/fonts/#XIV AXIS Std ATK"
TextWrapping="Wrap"
FontSize="{Binding App.Config.FontSize, ElementName=Main, UpdateSourceTrigger=PropertyChanged}"
ProcessMarkdown="{Binding ExportTab.ProcessMarkdown, ElementName=Main}"

11
XIVChat Desktop/MainWindow.xaml
View File

@ -106,11 +106,12 @@
<ItemsControl.ItemTemplate>
<DataTemplate>
<cc:MessageTextBlock FontFamily="Global User Interface, /fonts/#XIV AXIS Std ATK"
TextWrapping="Wrap"
FontSize="{Binding App.Config.FontSize, ElementName=Main, UpdateSourceTrigger=PropertyChanged}"
ProcessMarkdown="{Binding DataContext.ProcessMarkdown, ElementName=TabGrid}"
Message="{Binding .}" />
<cc:MessageTextBlock
FontFamily="Global User Interface, /Resources/fonts/#XIV AXIS Std ATK"
TextWrapping="Wrap"
FontSize="{Binding App.Config.FontSize, ElementName=Main, UpdateSourceTrigger=PropertyChanged}"
ProcessMarkdown="{Binding DataContext.ProcessMarkdown, ElementName=TabGrid}"
Message="{Binding .}" />
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>

0
XIVChat Desktop/fonts/ffxiv.ttf → XIVChat Desktop/Resources/fonts/ffxiv.ttf
View File

4
XIVChat Desktop/XIVChat Desktop.csproj
View File

@ -15,6 +15,7 @@
<ItemGroup>
<None Remove="Resources\fonticon_ps4.tex.png" />
<None Remove="Resources\fonts\ffxiv.ttf" />
<None Remove="Resources\logo.ico" />
<None Remove="Resources\status\app_status_afk.png" />
<None Remove="Resources\status\app_status_contents.png" />
@ -28,11 +29,11 @@
<None Remove="Resources\status\app_status_party_member.png" />
<None Remove="Resources\status\app_status_roleplaying.png" />
<None Remove="Resources\status\app_status_roleplaying.svg" />
<None Remove="fonts\ffxiv.ttf" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\fonticon_ps4.tex.png" />
<Resource Include="Resources\fonts\ffxiv.ttf" />
<Resource Include="Resources\logo.ico" />
<Resource Include="Resources\status\app_status_afk.png" />
<Resource Include="Resources\status\app_status_contents.png" />
@ -45,7 +46,6 @@
<Resource Include="Resources\status\app_status_party_leader.png" />
<Resource Include="Resources\status\app_status_party_member.png" />
<Resource Include="Resources\status\app_status_roleplaying.png" />
<Resource Include="fonts\ffxiv.ttf" />
</ItemGroup>
<ItemGroup>