From c9defe19f7f443f1c42e0816e974c3867cea962e Mon Sep 17 00:00:00 2001
From: Yuubari <remilia@koumakan.jp>
Date: Tue, 17 Nov 2015 17:07:34 +0300
Subject: [PATCH] Use Calibri for non-CJK characters in ship names

---
 .../Styles/Controls.Text.xaml                 | 20 ++++++++++++-------
 .../Properties/AssemblyInfo.cs                |  2 +-
 .../Views/Contents/Fleets.xaml                |  3 ++-
 .../Views/Contents/Overview.xaml              |  2 ++
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/source/Grabacr07.KanColleViewer.Controls/Styles/Controls.Text.xaml b/source/Grabacr07.KanColleViewer.Controls/Styles/Controls.Text.xaml
index 09ae82965..bcb8b8e03 100644
--- a/source/Grabacr07.KanColleViewer.Controls/Styles/Controls.Text.xaml
+++ b/source/Grabacr07.KanColleViewer.Controls/Styles/Controls.Text.xaml
@@ -172,11 +172,17 @@
 				Value="{DynamicResource ForegroundBrushKey}" />
 	</Style>
 
-
-
-
-
-
-
-
+	<FontFamily xmlns="http://schemas.microsoft.com/winfx/2006/xaml/composite-font"
+				LineSpacing="1.2"
+				x:Key="ShipNames">
+
+		<FontFamily.FamilyMaps>
+			<FontFamilyMap Unicode="3000-303F, 3040-309F, 30A0-30FF, FF00-FFEF, 4E00-9FAF"
+						   Target="Meiryo"
+						   Scale="1.0" />
+			<FontFamilyMap Unicode="0000-FFFF"
+						   Target="Calibri, Segoe UI"
+						   Scale="1.2" />
+		</FontFamily.FamilyMaps>
+	</FontFamily>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs b/source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs
index deadcd7a3..72a363d20 100644
--- a/source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs
+++ b/source/Grabacr07.KanColleViewer/Properties/AssemblyInfo.cs
@@ -52,4 +52,4 @@
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
 // 既定値にすることができます:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.1.6.0")]
+[assembly: AssemblyVersion("4.1.6.1")]
diff --git a/source/Grabacr07.KanColleViewer/Views/Contents/Fleets.xaml b/source/Grabacr07.KanColleViewer/Views/Contents/Fleets.xaml
index de37f6365..62f05c085 100644
--- a/source/Grabacr07.KanColleViewer/Views/Contents/Fleets.xaml
+++ b/source/Grabacr07.KanColleViewer/Views/Contents/Fleets.xaml
@@ -303,11 +303,12 @@
 											   Margin="4,0,10,0">
 										<Run Text="{Binding Ship.Info.Name, Mode=OneWay}"
 											 FontSize="22"
+											 FontFamily="{DynamicResource ShipNames}"
 											 Style="{DynamicResource EmphaticTextElementStyleKey}" />
 										<TextBlock.ToolTip>
 											<TextBlock Margin="0,-2,0,0">
 											<Run Text="{Binding StatsToolTip, Mode=OneWay}"
-													FontSize="11" />
+												 FontSize="11" />
 											</TextBlock>
 										</TextBlock.ToolTip>
 									</TextBlock>
diff --git a/source/Grabacr07.KanColleViewer/Views/Contents/Overview.xaml b/source/Grabacr07.KanColleViewer/Views/Contents/Overview.xaml
index 362e53fdd..9329d253f 100644
--- a/source/Grabacr07.KanColleViewer/Views/Contents/Overview.xaml
+++ b/source/Grabacr07.KanColleViewer/Views/Contents/Overview.xaml
@@ -167,6 +167,7 @@
 													   ToolTipService.HorizontalOffset="-9"
 													   ToolTipService.VerticalOffset="-3">
 												<Run Text="{Binding Ship.Info.Name, Mode=OneWay}"
+													 FontFamily="{DynamicResource ShipNames}"
 													 Style="{DynamicResource EmphaticTextElementStyleKey}" />
 												<LineBreak />
 												<Run Text="{Binding Ship.Info.ShipType.Name, Mode=OneWay}"
@@ -175,6 +176,7 @@
 												<TextBlock.ToolTip>
 													<TextBlock Margin="0,-2,0,0">
 													<Run Text="{Binding Ship.Info.Name, Mode=OneWay}"
+														 FontFamily="{DynamicResource ShipNames}"
 														 Style="{DynamicResource EmphaticTextElementStyleKey}" />
 													<LineBreak />
 													<Run Text="{Binding Ship.Info.ShipType.Name, Mode=OneWay}"