From ab8b6cbe305aa3051d8bfbf52b8acb546e536a23 Mon Sep 17 00:00:00 2001
From: pizzaboxer <pizzaboxer@pizzaboxer.xyz>
Date: Wed, 25 Oct 2023 13:48:45 +0100
Subject: [PATCH] Make hyperlinks (and help icons) look less ass

i've been using xaml for like a year but i'm only now learning how to properly use it
---
 Bloxstrap/App.xaml                            | 19 ++++++++++++++++++
 .../UI/Elements/Controls/MarkdownTextBlock.cs | 11 +++-------
 .../UI/Elements/Controls/OptionControl.xaml   | 20 ++++++++++++++++---
 3 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/Bloxstrap/App.xaml b/Bloxstrap/App.xaml
index 6af052a..22d731b 100644
--- a/Bloxstrap/App.xaml
+++ b/Bloxstrap/App.xaml
@@ -15,6 +15,25 @@
 
             <FontFamily x:Key="Rubik">pack://application:,,,/Resources/Fonts/#Rubik Light</FontFamily>
 
+            <Style TargetType="{x:Type Hyperlink}">
+                <Style.Triggers>
+                    <Trigger Property="IsMouseOver" Value="True">
+                        <Setter Property="Foreground">
+                            <Setter.Value>
+                                <SolidColorBrush Color="{DynamicResource SystemAccentColorTertiary}" />
+                            </Setter.Value>
+                        </Setter>
+                        <Setter Property="TextDecorations" Value="Underline" />
+                    </Trigger>
+                </Style.Triggers>
+                <Setter Property="TextDecorations" Value="None" />
+                <Setter Property="Foreground">
+                    <Setter.Value>
+                        <SolidColorBrush Color="{DynamicResource SystemAccentColorSecondary}" />
+                    </Setter.Value>
+                </Setter>
+            </Style>
+
             <converters:ResourceConverter x:Key="ResourceConverter" />
             <converters:StringFormatConverter x:Key="StringFormatConverter" />
         </ResourceDictionary>
diff --git a/Bloxstrap/UI/Elements/Controls/MarkdownTextBlock.cs b/Bloxstrap/UI/Elements/Controls/MarkdownTextBlock.cs
index cf852ce..dc3359b 100644
--- a/Bloxstrap/UI/Elements/Controls/MarkdownTextBlock.cs
+++ b/Bloxstrap/UI/Elements/Controls/MarkdownTextBlock.cs
@@ -50,11 +50,10 @@ namespace Bloxstrap.UI.Elements.Controls
                 return;
 
             MarkdownDocument document = Markdown.Parse((string)dependencyPropertyChangedEventArgs.NewValue);
-            ParagraphBlock? paragraphBlock = document.FirstOrDefault() as ParagraphBlock;
 
             markdownTextBlock.Inlines.Clear();
 
-            if (paragraphBlock == null || paragraphBlock.Inline == null)
+            if (document.FirstOrDefault() is not ParagraphBlock paragraphBlock || paragraphBlock.Inline == null)
                 return;
 
             foreach (var inline in paragraphBlock.Inline)
@@ -71,15 +70,11 @@ namespace Bloxstrap.UI.Elements.Controls
                     if (string.IsNullOrEmpty(url) || string.IsNullOrEmpty(text))
                         continue;
 
-                    var link = new Hyperlink(new Run(text))
+                    markdownTextBlock.Inlines.Add(new Hyperlink(new Run(text))
                     {
                         Command = GlobalViewModel.OpenWebpageCommand,
                         CommandParameter = url
-                    };
-
-                    link.SetResourceReference(Control.ForegroundProperty, "TextFillColorPrimaryBrush");
-
-                    markdownTextBlock.Inlines.Add(link);
+                    });
                 }
             }
         }
diff --git a/Bloxstrap/UI/Elements/Controls/OptionControl.xaml b/Bloxstrap/UI/Elements/Controls/OptionControl.xaml
index db7086e..e2d7213 100644
--- a/Bloxstrap/UI/Elements/Controls/OptionControl.xaml
+++ b/Bloxstrap/UI/Elements/Controls/OptionControl.xaml
@@ -21,16 +21,30 @@
                     <TextBlock Grid.Column="0" FontSize="14" Text="{Binding Header, ElementName=Control}" />
                     <TextBlock Grid.Column="1" Margin="4,0,0,0">
                         <TextBlock.Style>
-                            <Style>
+                            <Style TargetType="TextBlock">
                                 <Style.Triggers>
                                     <DataTrigger Binding="{Binding HelpLink, ElementName=Control}" Value="{x:Null}">
-                                        <Setter Property="TextBlock.Visibility" Value="Collapsed" />
+                                        <Setter Property="Visibility" Value="Collapsed" />
                                     </DataTrigger>
                                 </Style.Triggers>
                             </Style>
                         </TextBlock.Style>
                         <Hyperlink TextDecorations="None" ToolTip="{x:Static resources:Strings.Menu_MoreInfo}" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="{Binding HelpLink, ElementName=Control}">
-                            <ui:SymbolIcon Symbol="QuestionCircle48" Margin="0,1,0,0" />
+                            <ui:SymbolIcon Symbol="QuestionCircle48" Margin="0,1,0,0">
+                                <ui:SymbolIcon.Style>
+                                    <Style TargetType="ui:SymbolIcon" BasedOn="{StaticResource {x:Type ui:SymbolIcon}}">
+                                        <Style.Triggers>
+                                            <Trigger Property="IsMouseOver" Value="True">
+                                                <Setter Property="Foreground">
+                                                    <Setter.Value>
+                                                        <SolidColorBrush Color="{DynamicResource SystemAccentColorTertiary}" />
+                                                    </Setter.Value>
+                                                </Setter>
+                                            </Trigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </ui:SymbolIcon.Style>
+                            </ui:SymbolIcon>
                         </Hyperlink>
                     </TextBlock>
                 </Grid>