Merge pull request 'Remove windows only font' (#107 ) from MadByte/Installer:master into master

Reviewed-on: SPT/Installer#107 LGTM!
remove windows only font
2024-10-04 13:25:53 +00:00 · 2024-09-20 16:26:52 +02:00
2 changed files with 24 additions and 5 deletions
--- a/SPTInstaller/App.axaml
+++ b/SPTInstaller/App.axaml
@ -48,7 +48,14 @@
        <PathGeometry x:Key="Bug"
                      Figures="m 12.25 0 a 0.75 0.75 0 0 1 0.743 0.648 L 13 0.75 v 0.752 c 0 0.633 -0.196 1.22 -0.53 1.704 a 3.75 3.75 0 0 1 2.521 3.29 h 0.256 a 2.25 2.25 0 0 0 2.24 -2.259 L 17.481 2.752 a 0.750006 0.750006 0 0 1 1.5 -0.006 l 0.007 1.485 a 3.75 3.75 0 0 1 -3.536 3.76 L 15.238 7.997 L 15 7.996 v 1.502 h 4.253 a 0.75 0.75 0 0 1 0.743 0.649 l 0.007 0.102 a 0.75 0.75 0 0 1 -0.648 0.743 l -0.102 0.007 H 15 v 1.999 h 0.238 l 0.214 0.007 a 3.75 3.75 0 0 1 3.531 3.56 l 0.005 0.2 l -0.007 1.485 a 0.75 0.75 0 0 1 -1.493 0.095 l -0.007 -0.102 l 0.007 -1.485 a 2.25 2.25 0 0 0 -2.087 -2.253 l -0.154 -0.006 h -0.476 a 5.002 5.002 0 0 1 -9.542 0 H 4.74 A 2.25 2.25 0 0 0 2.5 16.758 l 0.005 1.485 a 0.750008 0.750008 0 1 1 -1.5 0.007 L 1 16.764 a 3.75 3.75 0 0 1 3.535 -3.76 L 4.75 12.999 L 5 12.998 v -2 H 0.75 A 0.75 0.75 0 0 1 0.007 10.35 L 0 10.249 A 0.75 0.75 0 0 1 0.648 9.506 L 0.75 9.499 L 5 9.498 V 7.996 H 4.75 L 4.535 7.991 A 3.75 3.75 0 0 1 1.005 4.431 L 1 4.23 L 1.006 2.745 A 0.75 0.75 0 0 1 2.5 2.649 L 2.506 2.751 L 2.5 4.237 A 2.25 2.25 0 0 0 4.587 6.491 L 4.741 6.497 H 5.009 A 3.753 3.753 0 0 1 7.53 3.205 A 2.968 2.968 0 0 1 7.006 1.711 L 7 1.502 V 0.75 A 0.75 0.75 0 0 1 8.493 0.648 L 8.5 0.75 v 0.752 a 1.5 1.5 0 0 0 2.993 0.145 L 11.5 1.502 V 0.75 A 0.75 0.75 0 0 1 12.25 0 Z"
                      FillRule="NonZero" />
-        <PathGeometry x:Key="OpenFolder" Figures="M 2.2731724 14.474999 C 2.5381753 14.186249 3.2824783 12.195001 3.9271792 10.05 5.6676413 4.2592679 4.7621113 4.8000009 12.719033 4.8000009 c 5.6684 0 6.78597 0.072438 7.12511 0.4618343 0.332844 0.3821726 0.17704 1.1971998 -0.903259 4.7250006 -0.763041 2.4917722 -1.52781 4.4189802 -1.840552 4.6381652 C 16.708149 14.899859 14.592619 15 9.1783054 15 2.1694393 15 1.8160107 14.973129 2.2731724 14.474999 Z M 0.36305228 14.025959 C 0.11166709 13.786409 0 11.721164 0 7.3114288 0 1.9218189 0.0760474 0.8703905 0.49472143 0.47142828 0.8806724 0.10364926 1.7051307 0 4.2446088 0 7.4749739 0 7.5058294 0.00685701 8.2944922 0.89999983 L 9.0892098 1.8 h 3.6407872 c 3.221023 0 3.71338 0.069177 4.270431 0.5999996 0.346306 0.3300009 0.629646 0.802501 0.629646 1.0500009 0 0.3838238 -0.858607 0.4500002 -5.83853 0.4500002 -5.6986082 0 -5.856156 0.016794 -6.5739181 0.7007613 C 4.8131633 4.9861817 4.2426547 6.0999322 3.9498292 7.0757619 2.3566037 12.385128 1.8127023 13.81777 1.2887903 14.084957 c -0.37832867 0.192941 -0.68163535 0.173611 -0.92573802 -0.059 z" 
+        <PathGeometry x:Key="OpenFolder"
+                      Figures="M 2.2731724 14.474999 C 2.5381753 14.186249 3.2824783 12.195001 3.9271792 10.05 5.6676413 4.2592679 4.7621113 4.8000009 12.719033 4.8000009 c 5.6684 0 6.78597 0.072438 7.12511 0.4618343 0.332844 0.3821726 0.17704 1.1971998 -0.903259 4.7250006 -0.763041 2.4917722 -1.52781 4.4189802 -1.840552 4.6381652 C 16.708149 14.899859 14.592619 15 9.1783054 15 2.1694393 15 1.8160107 14.973129 2.2731724 14.474999 Z M 0.36305228 14.025959 C 0.11166709 13.786409 0 11.721164 0 7.3114288 0 1.9218189 0.0760474 0.8703905 0.49472143 0.47142828 0.8806724 0.10364926 1.7051307 0 4.2446088 0 7.4749739 0 7.5058294 0.00685701 8.2944922 0.89999983 L 9.0892098 1.8 h 3.6407872 c 3.221023 0 3.71338 0.069177 4.270431 0.5999996 0.346306 0.3300009 0.629646 0.802501 0.629646 1.0500009 0 0.3838238 -0.858607 0.4500002 -5.83853 0.4500002 -5.6986082 0 -5.856156 0.016794 -6.5739181 0.7007613 C 4.8131633 4.9861817 4.2426547 6.0999322 3.9498292 7.0757619 2.3566037 12.385128 1.8127023 13.81777 1.2887903 14.084957 c -0.37832867 0.192941 -0.68163535 0.173611 -0.92573802 -0.059 z" 
+                      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>
--- a/SPTInstaller/CustomControls/TitleBar.axaml
+++ b/SPTInstaller/CustomControls/TitleBar.axaml
@ -20,7 +20,7 @@
               VerticalContentAlignment="Center" />

        <!-- Minimize (-) Button -->
-        <Button Content="&#xE949;" Grid.Column="2"
+        <Button Grid.Column="2"
                Foreground="{Binding ButtonForeground, RelativeSource={
 												 RelativeSource AncestorType=UserControl}}"
                Command="{Binding MinButtonCommand, RelativeSource={
@ -29,9 +29,15 @@
                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="{StaticResource SPT_Brush_DarkGrayBlue}" />
@ -44,7 +50,7 @@
        </Button>

        <!-- Close (X) Button -->
-        <Button Content="&#xE106;" Grid.Column="3"
+        <Button Grid.Column="3"
                Foreground="{Binding ButtonForeground, RelativeSource={
 				             RelativeSource AncestorType=UserControl}}"
                Command="{Binding XButtonCommand, RelativeSource={
@ -53,9 +59,15 @@
                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" />
Author	SHA1	Message	Date
IsWaffle	c855bab5e0	Merge pull request 'Remove windows only font' (#107 ) from MadByte/Installer:master into master Reviewed-on: SPT/Installer#107 LGTM!	2024-10-04 13:25:53 +00:00
MadByte	7b8dd9ada6	remove windows only font Port of commit `47efa367e9` - remove the windows only font used on some icons - replaces those html code icons with geometry paths	2024-09-20 16:26:52 +02:00