From 153f3d6191ce04b08d01bb359669f4c584470b1b Mon Sep 17 00:00:00 2001
From: Kenny Guo <kennyguo@microsoft.com>
Date: Thu, 29 Jul 2021 14:29:49 +0800
Subject: [PATCH] Fix hyperlink styles in Settings page

---
 src/Calculator/Views/Settings.xaml    | 72 ++++++++++++++++-----------
 src/Calculator/Views/Settings.xaml.cs | 11 ----
 2 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/src/Calculator/Views/Settings.xaml b/src/Calculator/Views/Settings.xaml
index e916d19e..3c699cd6 100644
--- a/src/Calculator/Views/Settings.xaml
+++ b/src/Calculator/Views/Settings.xaml
@@ -32,6 +32,10 @@
             </Style>
 
             <automation:NarratorNotifier x:Name="NarratorNotifier"/>
+
+            <!-- Override default hyperlink button background color -->
+            <StaticResource x:Key="HyperlinkButtonBackgroundPointerOver" ResourceKey="SubtleFillColorTransparentBrush"/>
+            <StaticResource x:Key="HyperlinkButtonBackgroundPressed" ResourceKey="SubtleFillColorTransparentBrush"/>
         </ResourceDictionary>
     </UserControl.Resources>
 
@@ -173,32 +177,38 @@
                                 <LineBreak/>
                                 <Run x:Name="AboutControlCopyrightRun"/>
                             </Paragraph>
-
-                            <Paragraph Margin="0,16,0,0">
-                                <Hyperlink NavigateUri="https://go.microsoft.com/fwlink/?LinkID=529064"
-                                           TextDecorations="None"
-                                           ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?LinkID=529064">
-                                    <Run x:Name="AboutEULA"/>
-                                </Hyperlink>
-                            </Paragraph>
-
-                            <Paragraph Margin="0,16,0,0">
-                                <Hyperlink NavigateUri="https://go.microsoft.com/fwlink/?LinkID=822631"
-                                           TextDecorations="None"
-                                           ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?LinkID=822631">
-                                    <Run x:Name="AboutControlServicesAgreement"/>
-                                </Hyperlink>
-                            </Paragraph>
-
-                            <Paragraph Margin="0,16,0,0">
-                                <Hyperlink NavigateUri="https://go.microsoft.com/fwlink/?LinkID=521839"
-                                           TextDecorations="None"
-                                           ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?LinkID=521839">
-                                    <Run x:Name="AboutControlPrivacyStatement"/>
-                                </Hyperlink>
-                            </Paragraph>
                         </RichTextBlock>
 
+                        <HyperlinkButton x:Name="AboutEULA"
+                                         Margin="0,16,0,0"
+                                         Padding="0"
+                                         NavigateUri="https://go.microsoft.com/fwlink/?LinkID=529064"
+                                         ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?LinkID=529064">
+                            <TextBlock x:Uid="AboutEULA"
+                                       FontSize="{ThemeResource BodyFontSize}"
+                                       TextWrapping="Wrap"/>
+                        </HyperlinkButton>
+
+                        <HyperlinkButton x:Name="AboutControlServicesAgreement"
+                                         Margin="0,16,0,0"
+                                         Padding="0"
+                                         NavigateUri="https://go.microsoft.com/fwlink/?LinkID=822631"
+                                         ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?LinkID=822631">
+                            <TextBlock x:Uid="AboutControlServicesAgreement"
+                                       FontSize="{ThemeResource BodyFontSize}"
+                                       TextWrapping="Wrap"/>
+                        </HyperlinkButton>
+
+                        <HyperlinkButton x:Name="AboutControlPrivacyStatement"
+                                         Margin="0,16,0,0"
+                                         Padding="0"
+                                         NavigateUri="https://go.microsoft.com/fwlink/?LinkID=521839"
+                                         ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?LinkID=521839">
+                            <TextBlock x:Uid="AboutControlPrivacyStatement"
+                                       FontSize="{ThemeResource BodyFontSize}"
+                                       TextWrapping="Wrap"/>
+                        </HyperlinkButton>
+
                         <Button x:Name="FeedbackButton"
                                 x:Uid="FeedbackButton"
                                 MinWidth="120"
@@ -213,13 +223,17 @@
                                    Margin="0,16,0,0"
                                    Style="{StaticResource SettingsRichTextBlockStyle}">
                         <Paragraph>
-                            <Run x:Name="ContributeRunBeforeLink"/>
-                            <Hyperlink NavigateUri="https://go.microsoft.com/fwlink/?linkid=2099939"
+                            <!--
+                                Note: don't put Hyperlink element start to the next line
+                                otherwise unexpected whitespace will be add.
+                            -->
+                            <Run x:Name="ContributeRunBeforeLink"/><Hyperlink Foreground="{x:Bind AboutEULA.Foreground, Mode=OneWay}"
+                                       NavigateUri="https://go.microsoft.com/fwlink/?linkid=2099939"
                                        TextDecorations="None"
-                                       ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?linkid=2099939">
+                                       ToolTipService.ToolTip="https://go.microsoft.com/fwlink/?linkid=2099939"
+                                       UnderlineStyle="None">
                                 <Run x:Name="ContributeRunLink"/>
-                            </Hyperlink>
-                            <Run x:Name="ContributeRunAfterLink"/>
+                            </Hyperlink><Run x:Name="ContributeRunAfterLink"/>
                         </Paragraph>
                     </RichTextBlock>
                 </Grid>
diff --git a/src/Calculator/Views/Settings.xaml.cs b/src/Calculator/Views/Settings.xaml.cs
index 366d32a4..715f3b14 100644
--- a/src/Calculator/Views/Settings.xaml.cs
+++ b/src/Calculator/Views/Settings.xaml.cs
@@ -96,7 +96,6 @@ namespace CalculatorApp
         private void InitializeAboutContentTextBlock()
         {
             SetVersionString();
-            SetContentLinks();
         }
 
         private void SetVersionString()
@@ -106,16 +105,6 @@ namespace CalculatorApp
             AboutBuildVersion.Text = appName + " " + version.Major + "." + version.Minor + "." + version.Build + "." + version.Revision;
         }
 
-        private void SetContentLinks()
-        {
-            string eula = AppResourceProvider.GetInstance().GetResourceString(AboutEULA.Name + "/Text");
-            AboutEULA.Text = eula;
-            string agreement = AppResourceProvider.GetInstance().GetResourceString(AboutControlServicesAgreement.Name + "/Text");
-            AboutControlServicesAgreement.Text = agreement;
-            string privacyState = AppResourceProvider.GetInstance().GetResourceString(AboutControlPrivacyStatement.Name + "/Text");
-            AboutControlPrivacyStatement.Text = privacyState;
-        }
-
         private void InitializeContributeTextBlock()
         {
             var resProvider = AppResourceProvider.GetInstance();