From 47efa367e9d3d1271cada575d85b217dd8a267fd Mon Sep 17 00:00:00 2001
From: "waffle.lord" <waffle.lord@hotmail.com>
Date: Tue, 17 Sep 2024 16:36:11 +0000
Subject: [PATCH] remove windows only font (!67)

fixes [#732](https://dev.sp-tarkov.com/SPT/Issues/issues/732)

- remove the windows only font used on some icons
- replaces those html code icons with geometry paths

Reviewed-on: https://dev.sp-tarkov.com/SPT/Launcher/pulls/67
Co-authored-by: waffle.lord <waffle.lord@hotmail.com>
Co-committed-by: waffle.lord <waffle.lord@hotmail.com>
---
 project/SPT.Launcher/App.axaml                | 12 +++++++
 .../CustomControls/TitleBar.axaml             | 32 ++++++++++++++-----
 project/SPT.Launcher/Views/SettingsView.axaml | 14 +++++---
 3 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/project/SPT.Launcher/App.axaml b/project/SPT.Launcher/App.axaml
index f7def06..9c14bd5 100644
--- a/project/SPT.Launcher/App.axaml
+++ b/project/SPT.Launcher/App.axaml
@@ -79,6 +79,18 @@
 		<PathGeometry x:Key="Info" Figures="M 12 1.999 c 5.524 0 10.002 4.478 10.002 10.002 c 0 5.523 -4.478 10.001 -10.002 10.001 c -5.524 0 -10.002 -4.478 -10.002 -10.001 C 1.998 6.477 6.476 1.999 12 1.999 Z m -0.004 8.25 a 1 1 0 0 0 -0.992 0.885 l -0.007 0.116 l 0.003 5.502 l 0.007 0.117 a 1 1 0 0 0 1.987 -0.002 L 13 16.75 l -0.003 -5.501 l -0.007 -0.117 a 1 1 0 0 0 -0.994 -0.882 Z M 12 6.5 a 1.251 1.251 0 1 0 0 2.503 A 1.251 1.251 0 0 0 12 6.5 Z" 
 		              FillRule="NonZero"
 		              />
+		
+		<PathGeometry x:Key="BackArrow" Figures="M12 2.001c5.524 0 10 4.477 10 10s-4.476 10-10 10c-5.522 0-10-4.477-10-10s4.478-10 10-10Zm.781 5.469-.084-.073a.75.75 0 0 0-.883-.007l-.094.08-.072.084a.75.75 0 0 0-.007.883l.08.094 2.719 2.72H7.75l-.102.006a.75.75 0 0 0-.641.642L7 12l.007.102a.75.75 0 0 0 .641.641l.102.007h6.69l-2.72 2.72-.073.085a.75.75 0 0 0 1.05 1.05l.083-.073 4.002-4 .072-.085a.75.75 0 0 0 .008-.882l-.08-.094-4-4.001-.085-.073.084.073Z"
+		              FillRule="NonZero"
+		              />
+		
+		<PathGeometry x:Key="Close" Figures="m4.21 4.387.083-.094a1 1 0 0 1 1.32-.083l.094.083L12 10.585l6.293-6.292a1 1 0 1 1 1.414 1.414L13.415 12l6.292 6.293a1 1 0 0 1 .083 1.32l-.083.094a1 1 0 0 1-1.32.083l-.094-.083L12 13.415l-6.293 6.292a1 1 0 0 1-1.414-1.414L10.585 12 4.293 5.707a1 1 0 0 1-.083-1.32l.083-.094-.083.094Z"
+		              FillRule="NonZero"
+		              />
+		
+		<PathGeometry x:Key="Minimize" Figures="M3.997 13H20a1 1 0 1 0 0-2H3.997a1 1 0 1 0 0 2Z"
+		              FillRule="NonZero"
+		              />
 
 	</Application.Resources>
 </Application>
diff --git a/project/SPT.Launcher/CustomControls/TitleBar.axaml b/project/SPT.Launcher/CustomControls/TitleBar.axaml
index 2be7281..3c0cc89 100644
--- a/project/SPT.Launcher/CustomControls/TitleBar.axaml
+++ b/project/SPT.Launcher/CustomControls/TitleBar.axaml
@@ -23,8 +23,7 @@
 			     />
 
 		<!-- Setting button -->
-		<Button x:Name="stb"
-				Grid.Column="2"
+		<Button Grid.Column="2"
 				FontSize="12"
 				Command="{Binding SettingsButtonCommand, RelativeSource={
 			              RelativeSource AncestorType=UserControl}}"
@@ -33,14 +32,19 @@
 				IsVisible="{Binding Source={x:Static helpers:LauncherSettingsProvider.Instance}, Path=AllowSettings}"
             >
 			<StackPanel Orientation="Horizontal">
-				<Path Data="{StaticResource Gear}" Fill="{Binding ElementName=stb, Path=Foreground}"
-					  Margin="2"/>
+				<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center">
+					<Viewbox Width="14" Height="14" Margin="2">
+						<Path Data="{StaticResource Gear}" 
+						      Fill="{Binding $parent[TextBlock].Foreground}"
+						/>
+					</Viewbox>
+				</TextBlock>
 				<TextBlock Text="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=settings_menu}"/>
 			</StackPanel>
 		</Button>
 
 		<!-- Minimize (-) Button -->
-		<Button Content="&#xE949;" Grid.Column="4"
+		<Button Grid.Column="4"
 				Foreground="{Binding ButtonForeground, RelativeSource={
 												 RelativeSource AncestorType=UserControl}}"
 				Command="{Binding MinButtonCommand, RelativeSource={
@@ -49,10 +53,16 @@
 				HorizontalContentAlignment="Center"
 				VerticalContentAlignment="Center"
 				VerticalAlignment="Stretch"
-				FontFamily="Segoe MDL2 Assets"
 				CornerRadius="0"
 				Width="35"
             >
+			<Viewbox Width="15" Height="15">
+				<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center">
+					<Path Data="{StaticResource Minimize}"
+					      Fill="{Binding $parent[TextBlock].Foreground}"
+					/>
+				</TextBlock>
+			</Viewbox>
 			<Button.Styles>
 				<Style Selector="Button:pointerover /template/ ContentPresenter">
 					<Setter Property="Background" Value="{DynamicResource AccentBrush2}"/>
@@ -65,7 +75,7 @@
 		</Button>
 
 		<!-- Close (X) Button -->
-		<Button Content="&#xE106;" Grid.Column="5"
+		<Button Grid.Column="5"
 				Foreground="{Binding ButtonForeground, RelativeSource={
 				             RelativeSource AncestorType=UserControl}}"
 				Command="{Binding XButtonCommand, RelativeSource={
@@ -74,10 +84,16 @@
 				HorizontalContentAlignment="Center"
 				VerticalContentAlignment="Center"
 				VerticalAlignment="Stretch"
-				FontFamily="Segoe MDL2 Assets"
 				CornerRadius="0"
 				Width="35"
             >
+			<Viewbox Width="15" Height="15">
+				<TextBlock>
+					<Path Data="{StaticResource Close}"
+					      Fill="{Binding $parent[TextBlock].Foreground}"
+					/>
+				</TextBlock>
+			</Viewbox>
 			<Button.Styles>
 				<Style Selector="Button:pointerover /template/ ContentPresenter">
 					<Setter Property="Background" Value="IndianRed"/>
diff --git a/project/SPT.Launcher/Views/SettingsView.axaml b/project/SPT.Launcher/Views/SettingsView.axaml
index dd981c3..a8fe6cc 100644
--- a/project/SPT.Launcher/Views/SettingsView.axaml
+++ b/project/SPT.Launcher/Views/SettingsView.axaml
@@ -39,11 +39,17 @@
     </WrapPanel>
     
     <!-- Go Back -->
-    <Button Content="&#x279C;" FontSize="25"
-            Grid.Row="1" Grid.Column="3"
+    <Button Grid.Row="1" Grid.Column="3"
             Command="{Binding GoBackCommand}"
-            Classes="link"
-            />
+            Classes="link">
+      <TextBlock>
+        <Viewbox Height="30" Width="30">
+          <Path Data="{StaticResource BackArrow}"
+                Fill="{Binding $parent[TextBlock].Foreground}"
+          />
+        </Viewbox>
+      </TextBlock>
+    </Button>
     
     <!-- Default locale -->
     <StackPanel Grid.Row="2" Grid.Column="1">