Port microsoft/microsoft-ui-xaml#4128 (#577)

Kinnara · Oct 19, 2023 · cca3546 · cca3546
1 parent f5c5388
commit cca3546
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/ModernWpf/Styles/Hyperlink.xaml b/ModernWpf/Styles/Hyperlink.xaml
@@ -1,8 +1,11 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="clr-namespace:System;assembly=mscorlib"
     xmlns:primitives="clr-namespace:ModernWpf.Controls.Primitives">
 
+    <sys:Boolean x:Key="HyperlinkUnderlineVisible">False</sys:Boolean>
+
     <Style x:Key="DefaultHyperlinkStyle" TargetType="Hyperlink">
         <Setter Property="Foreground" Value="{DynamicResource HyperlinkForeground}" />
         <Setter Property="TextDecorations" Value="Underline" />

diff --git a/ModernWpf/Styles/ListView.xaml b/ModernWpf/Styles/ListView.xaml
@@ -9,6 +9,8 @@
     <sys:Double x:Key="GridViewColumnHeaderMinHeight">33</sys:Double>
     <sys:Double x:Key="GridViewItemContainerMinHeight">32</sys:Double>
 
+    <sys:Boolean x:Key="ListViewBaseItemRoundedChromeEnabled">True</sys:Boolean>
+
     <Style x:Key="DefaultListViewItemStyle" TargetType="ListViewItem">
         <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />

diff --git a/test/ModernWpfTestApp/CommonStylesPage.xaml b/test/ModernWpfTestApp/CommonStylesPage.xaml
@@ -282,11 +282,14 @@
                                 ui:ControlHelper.Header="RichEditBox"
                                 HorizontalAlignment="Right"
                                 VerticalAlignment="Top" />
-                            <TextBlock Grid.Row="7">
-                                <Run>Pre-hyperlink</Run>
-                                <Hyperlink NavigateUri="http://www.bing.com">Bing</Hyperlink>
-                                <Run>Post-hyperlink</Run>
-                            </TextBlock>
+                            <StackPanel Orientation="Horizontal" Grid.Row="7">
+                                <TextBlock Margin="2,0,2,0">
+                                    <Run>Pre-hyperlink</Run>
+                                    <Hyperlink NavigateUri="http://www.bing.com">Bing</Hyperlink>
+                                    <Run>Post-hyperlink</Run>
+                                </TextBlock>
+                                <HyperlinkButton Margin="2,0,2,0" Content="Microsoft.com HyperlinkButton" NavigateUri="http://www.microsoft.com"/>
+                            </StackPanel>
                         </Grid>
                     </StackPanel>
                 </Border>
@@ -385,11 +388,14 @@
                                 Grid.Row="6"
                                 ui:ControlHelper.Header="RichEditBox"
                                 VerticalAlignment="Top" />
-                            <TextBlock Grid.Row="7">
-                                <Run>Pre-hyperlink</Run>
-                                <Hyperlink NavigateUri="http://www.bing.com">Bing</Hyperlink>
-                                <Run>Post-hyperlink</Run>
-                            </TextBlock>
+                            <StackPanel Orientation="Horizontal" Grid.Row="7">
+                                <TextBlock Margin="2,0,2,0">
+                                    <Run>Pre-hyperlink</Run>
+                                    <Hyperlink NavigateUri="http://www.bing.com">Bing</Hyperlink>
+                                    <Run>Post-hyperlink</Run>
+                                </TextBlock>
+                                <HyperlinkButton Margin="2,0,2,0" Content="Microsoft.com HyperlinkButton" NavigateUri="http://www.microsoft.com"/>
+                            </StackPanel>
                         </Grid>
                     </StackPanel>
                 </Border>