0
0
mirror of https://github.com/sp-tarkov/launcher.git synced 2025-02-12 17:10:44 -05:00

remove windows only font (!67)

fixes [#732](SPT/Issues#732)

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

Reviewed-on: SPT/Launcher#67
Co-authored-by: waffle.lord <waffle.lord@hotmail.com>
Co-committed-by: waffle.lord <waffle.lord@hotmail.com>
This commit is contained in:
IsWaffle 2024-09-17 16:36:11 +00:00 committed by chomp
parent 14fe1d90c3
commit 47efa367e9
3 changed files with 46 additions and 12 deletions

View File

@ -80,5 +80,17 @@
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>

View File

@ -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"/>

View File

@ -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">