mirror of
https://github.com/sp-tarkov/launcher.git
synced 2025-02-12 16:50:43 -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:
parent
14fe1d90c3
commit
47efa367e9
@ -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"
|
<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"
|
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.Resources>
|
||||||
</Application>
|
</Application>
|
||||||
|
@ -23,8 +23,7 @@
|
|||||||
/>
|
/>
|
||||||
|
|
||||||
<!-- Setting button -->
|
<!-- Setting button -->
|
||||||
<Button x:Name="stb"
|
<Button Grid.Column="2"
|
||||||
Grid.Column="2"
|
|
||||||
FontSize="12"
|
FontSize="12"
|
||||||
Command="{Binding SettingsButtonCommand, RelativeSource={
|
Command="{Binding SettingsButtonCommand, RelativeSource={
|
||||||
RelativeSource AncestorType=UserControl}}"
|
RelativeSource AncestorType=UserControl}}"
|
||||||
@ -33,14 +32,19 @@
|
|||||||
IsVisible="{Binding Source={x:Static helpers:LauncherSettingsProvider.Instance}, Path=AllowSettings}"
|
IsVisible="{Binding Source={x:Static helpers:LauncherSettingsProvider.Instance}, Path=AllowSettings}"
|
||||||
>
|
>
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
<Path Data="{StaticResource Gear}" Fill="{Binding ElementName=stb, Path=Foreground}"
|
<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center">
|
||||||
Margin="2"/>
|
<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}"/>
|
<TextBlock Text="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=settings_menu}"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
<!-- Minimize (-) Button -->
|
<!-- Minimize (-) Button -->
|
||||||
<Button Content="" Grid.Column="4"
|
<Button Grid.Column="4"
|
||||||
Foreground="{Binding ButtonForeground, RelativeSource={
|
Foreground="{Binding ButtonForeground, RelativeSource={
|
||||||
RelativeSource AncestorType=UserControl}}"
|
RelativeSource AncestorType=UserControl}}"
|
||||||
Command="{Binding MinButtonCommand, RelativeSource={
|
Command="{Binding MinButtonCommand, RelativeSource={
|
||||||
@ -49,10 +53,16 @@
|
|||||||
HorizontalContentAlignment="Center"
|
HorizontalContentAlignment="Center"
|
||||||
VerticalContentAlignment="Center"
|
VerticalContentAlignment="Center"
|
||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
FontFamily="Segoe MDL2 Assets"
|
|
||||||
CornerRadius="0"
|
CornerRadius="0"
|
||||||
Width="35"
|
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>
|
<Button.Styles>
|
||||||
<Style Selector="Button:pointerover /template/ ContentPresenter">
|
<Style Selector="Button:pointerover /template/ ContentPresenter">
|
||||||
<Setter Property="Background" Value="{DynamicResource AccentBrush2}"/>
|
<Setter Property="Background" Value="{DynamicResource AccentBrush2}"/>
|
||||||
@ -65,7 +75,7 @@
|
|||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
<!-- Close (X) Button -->
|
<!-- Close (X) Button -->
|
||||||
<Button Content="" Grid.Column="5"
|
<Button Grid.Column="5"
|
||||||
Foreground="{Binding ButtonForeground, RelativeSource={
|
Foreground="{Binding ButtonForeground, RelativeSource={
|
||||||
RelativeSource AncestorType=UserControl}}"
|
RelativeSource AncestorType=UserControl}}"
|
||||||
Command="{Binding XButtonCommand, RelativeSource={
|
Command="{Binding XButtonCommand, RelativeSource={
|
||||||
@ -74,10 +84,16 @@
|
|||||||
HorizontalContentAlignment="Center"
|
HorizontalContentAlignment="Center"
|
||||||
VerticalContentAlignment="Center"
|
VerticalContentAlignment="Center"
|
||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
FontFamily="Segoe MDL2 Assets"
|
|
||||||
CornerRadius="0"
|
CornerRadius="0"
|
||||||
Width="35"
|
Width="35"
|
||||||
>
|
>
|
||||||
|
<Viewbox Width="15" Height="15">
|
||||||
|
<TextBlock>
|
||||||
|
<Path Data="{StaticResource Close}"
|
||||||
|
Fill="{Binding $parent[TextBlock].Foreground}"
|
||||||
|
/>
|
||||||
|
</TextBlock>
|
||||||
|
</Viewbox>
|
||||||
<Button.Styles>
|
<Button.Styles>
|
||||||
<Style Selector="Button:pointerover /template/ ContentPresenter">
|
<Style Selector="Button:pointerover /template/ ContentPresenter">
|
||||||
<Setter Property="Background" Value="IndianRed"/>
|
<Setter Property="Background" Value="IndianRed"/>
|
||||||
|
@ -39,11 +39,17 @@
|
|||||||
</WrapPanel>
|
</WrapPanel>
|
||||||
|
|
||||||
<!-- Go Back -->
|
<!-- Go Back -->
|
||||||
<Button Content="➜" FontSize="25"
|
<Button Grid.Row="1" Grid.Column="3"
|
||||||
Grid.Row="1" Grid.Column="3"
|
|
||||||
Command="{Binding GoBackCommand}"
|
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 -->
|
<!-- Default locale -->
|
||||||
<StackPanel Grid.Row="2" Grid.Column="1">
|
<StackPanel Grid.Row="2" Grid.Column="1">
|
||||||
|
Loading…
x
Reference in New Issue
Block a user