From 17f1c873aee1d36d752ae44cb6ee779b06a504bf Mon Sep 17 00:00:00 2001
From: DismissedLight <1686188646@qq.com>
Date: Sat, 7 Oct 2023 23:49:23 +0800
Subject: [PATCH] shadow complete

---
 src/Snap.Hutao/Snap.Hutao/App.xaml            |  4 +-
 .../View/Control/HutaoStatisticsCard.xaml     |  9 +-
 .../View/Control/StatisticsCard.xaml          |  7 +-
 .../View/Page/AnnouncementPage.xaml           | 10 +--
 .../View/Page/AvatarPropertyPage.xaml         | 27 +++---
 .../Snap.Hutao/View/Page/GachaLogPage.xaml    | 22 +++--
 .../Snap.Hutao/View/Page/SettingPage.xaml     |  6 +-
 .../Snap.Hutao/View/Page/WikiAvatarPage.xaml  | 39 ++++----
 .../Snap.Hutao/View/Page/WikiWeaponPage.xaml  | 90 ++++++++++---------
 9 files changed, 123 insertions(+), 91 deletions(-)

diff --git a/src/Snap.Hutao/Snap.Hutao/App.xaml b/src/Snap.Hutao/Snap.Hutao/App.xaml
index 4b62fb94..2f382bce 100644
--- a/src/Snap.Hutao/Snap.Hutao/App.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/App.xaml
@@ -146,13 +146,13 @@
                 <Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}"/>
                 <Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}"/>
                 <Setter Property="BorderThickness" Value="1"/>
-                <Setter Property="CornerRadius" Value="{StaticResource CompatCornerRadius}"/>
+                <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}"/>
             </Style>
             <Style x:Key="BorderGridStyle" TargetType="Grid">
                 <Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}"/>
                 <Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}"/>
                 <Setter Property="BorderThickness" Value="1"/>
-                <Setter Property="CornerRadius" Value="{StaticResource CompatCornerRadius}"/>
+                <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}"/>
             </Style>
             <Style
                 x:Name="NoneSelectionListViewItemStyle"
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/HutaoStatisticsCard.xaml b/src/Snap.Hutao/Snap.Hutao/View/Control/HutaoStatisticsCard.xaml
index ca35d7ca..75365135 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Control/HutaoStatisticsCard.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Control/HutaoStatisticsCard.xaml
@@ -34,10 +34,15 @@
 
         <Grid
             Grid.Row="0"
+            cw:UIElementExtensions.ClipToBounds="True"
             CornerRadius="{StaticResource ControlCornerRadiusTop}"
             Style="{StaticResource BorderGridStyle}">
-            <cwc:ConstrainedBox AspectRatio="1080:533">
-                <shci:CachedImage Source="{Binding Event.Banner}"/>
+            <cwc:ConstrainedBox
+                Margin="-1"
+                HorizontalAlignment="Center"
+                AspectRatio="1080:533"
+                CornerRadius="{ThemeResource ControlCornerRadiusTop}">
+                <shci:CachedImage Source="{Binding Event.Banner}" Stretch="UniformToFill"/>
             </cwc:ConstrainedBox>
         </Grid>
 
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsCard.xaml b/src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsCard.xaml
index dba3d053..e46acd12 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsCard.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Control/StatisticsCard.xaml
@@ -293,12 +293,12 @@
 
         <cwcont:SwitchPresenter
             Grid.Row="2"
-            Margin="12,6,12,12"
+            Margin="12,0"
             ContentTransitions="{StaticResource ContentThemeTransitions}"
             Value="{Binding ElementName=ItemsPanelSelector, Path=Current}">
-
             <cwcont:Case Value="List">
                 <ListView
+                    Padding="0,6,0,12"
                     ItemContainerStyle="{StaticResource NoneSelectionListViewItemStyle}"
                     ItemTemplate="{StaticResource OrangeListTemplate}"
                     ItemsSource="{Binding OrangeList}"
@@ -307,7 +307,8 @@
             </cwcont:Case>
             <cwcont:Case Value="Grid">
                 <GridView
-                    Margin="0,0,-4,0"
+                    Margin="0,0,-2,-4"
+                    Padding="0,12"
                     ItemContainerStyle="{StaticResource NoneSelectionGridViewItemStyle}"
                     ItemTemplate="{StaticResource OrangeGridTemplate}"
                     ItemsSource="{Binding OrangeList}"
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/AnnouncementPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/AnnouncementPage.xaml
index 9490dd80..3e0354dc 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/AnnouncementPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/AnnouncementPage.xaml
@@ -5,6 +5,7 @@
     xmlns:cw="using:CommunityToolkit.WinUI"
     xmlns:cwa="using:CommunityToolkit.WinUI.Animations"
     xmlns:cwb="using:CommunityToolkit.WinUI.Behaviors"
+    xmlns:cww="using:CommunityToolkit.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:mxi="using:Microsoft.Xaml.Interactivity"
@@ -50,12 +51,11 @@
                                         <RowDefinition Height="auto"/>
                                     </Grid.RowDefinitions>
                                     <!--  Image Layer  -->
-                                    <Border cw:UIElementExtensions.ClipToBounds="True">
+                                    <Border cw:UIElementExtensions.ClipToBounds="True" CornerRadius="{ThemeResource ControlCornerRadius}">
                                         <Border VerticalAlignment="Top" cw:VisualExtensions.NormalizedCenterPoint="0.5">
-                                            <shci:CachedImage Source="{Binding Banner}" Stretch="UniformToFill"/>
-                                            <mxi:Interaction.Behaviors>
-                                                <shcb:AutoHeightBehavior TargetHeight="390" TargetWidth="1080"/>
-                                            </mxi:Interaction.Behaviors>
+                                            <cww:ConstrainedBox AspectRatio="1080:390" CornerRadius="{ThemeResource ControlCornerRadius}">
+                                                <shci:CachedImage Source="{Binding Banner}" Stretch="UniformToFill"/>
+                                            </cww:ConstrainedBox>
                                             <cwa:Explicit.Animations>
                                                 <cwa:AnimationSet x:Name="ImageZoomInAnimation">
                                                     <shca:ImageZoomInAnimation/>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml
index 45360f2f..35679ff6 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml
@@ -137,9 +137,13 @@
                                                         <RowDefinition Height="auto"/>
                                                         <RowDefinition/>
                                                     </Grid.RowDefinitions>
-                                                    <Border Grid.RowSpan="2" Grid.ColumnSpan="2">
+                                                    <Border
+                                                        Grid.RowSpan="2"
+                                                        Grid.ColumnSpan="2"
+                                                        CornerRadius="{ThemeResource ControlCornerRadius}">
                                                         <shci:CachedImage
                                                             MaxWidth="145"
+                                                            HorizontalAlignment="Right"
                                                             Opacity="0.5"
                                                             Source="{Binding NameCard}"
                                                             Stretch="UniformToFill"/>
@@ -152,8 +156,8 @@
                                                         Text="{Binding Level}">
                                                         <Grid>
                                                             <shvcont:ItemIcon
-                                                                Width="61"
-                                                                Height="61"
+                                                                Width="61.5"
+                                                                Height="61.5"
                                                                 Icon="{Binding Icon}"
                                                                 Quality="{Binding Quality}"/>
                                                             <Border
@@ -175,8 +179,8 @@
                                                         Text="{Binding Weapon.Level}">
                                                         <Grid>
                                                             <shvcont:ItemIcon
-                                                                Width="61"
-                                                                Height="61"
+                                                                Width="61.5"
+                                                                Height="61.5"
                                                                 Icon="{Binding Weapon.Icon}"
                                                                 Quality="{Binding Weapon.Quality}"/>
                                                             <Border
@@ -310,7 +314,7 @@
                                         HorizontalAlignment="Left">
                                         <!--  卡片面板  -->
                                         <Border Margin="16" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
-                                            <Grid Style="{StaticResource BorderGridStyle}">
+                                            <Grid cw:UIElementExtensions.ClipToBounds="True" Style="{StaticResource BorderGridStyle}">
                                                 <Grid.RowDefinitions>
                                                     <RowDefinition/>
                                                     <RowDefinition Height="auto"/>
@@ -322,10 +326,13 @@
                                                 <cwcont:ConstrainedBox
                                                     Grid.RowSpan="2"
                                                     Grid.ColumnSpan="2"
-                                                    AspectRatio="840:400">
+                                                    AspectRatio="840:400"
+                                                    CornerRadius="{ThemeResource ControlCornerRadius}">
                                                     <shci:CachedImage
                                                         Grid.RowSpan="2"
                                                         Grid.ColumnSpan="2"
+                                                        HorizontalAlignment="Center"
+                                                        VerticalAlignment="Center"
                                                         Source="{Binding SelectedAvatar.NameCard}"
                                                         Stretch="UniformToFill"/>
                                                 </cwcont:ConstrainedBox>
@@ -384,13 +391,11 @@
                                                         </Grid.ColumnDefinitions>
                                                         <Button
                                                             Padding="0"
+                                                            cw:Effects.Shadow="{ThemeResource CompatCardShadow}"
                                                             BorderBrush="{x:Null}"
                                                             BorderThickness="0">
                                                             <Button.Content>
-                                                                <shvcont:ItemIcon
-                                                                    cw:Effects.Shadow="{ThemeResource CompatCardShadow}"
-                                                                    Icon="{Binding Icon}"
-                                                                    Quality="{Binding Quality}"/>
+                                                                <shvcont:ItemIcon Icon="{Binding Icon}" Quality="{Binding Quality}"/>
                                                             </Button.Content>
                                                             <Button.Flyout>
                                                                 <Flyout Placement="BottomEdgeAlignedLeft">
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/GachaLogPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/GachaLogPage.xaml
index 6b5256ae..4de5f6c8 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/GachaLogPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/GachaLogPage.xaml
@@ -2,6 +2,7 @@
     x:Class="Snap.Hutao.View.Page.GachaLogPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:cw="using:CommunityToolkit.WinUI"
     xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -10,7 +11,6 @@
     xmlns:shcb="using:Snap.Hutao.Control.Behavior"
     xmlns:shci="using:Snap.Hutao.Control.Image"
     xmlns:shcm="using:Snap.Hutao.Control.Markup"
-    xmlns:shcp="using:Snap.Hutao.Control.Panel"
     xmlns:shvc="using:Snap.Hutao.View.Control"
     xmlns:shvg="using:Snap.Hutao.ViewModel.GachaLog"
     d:DataContext="{d:DesignInstance shvg:GachaLogViewModel}"
@@ -342,17 +342,25 @@
                         <SplitView.Content>
                             <ScrollViewer>
                                 <StackPanel Margin="16,0,16,0">
+
                                     <Border
-                                        MaxWidth="690"
-                                        MaxHeight="320"
                                         Margin="0,16,0,0"
                                         HorizontalAlignment="Left"
-                                        Style="{StaticResource BorderCardStyle}">
-                                        <cwc:ConstrainedBox AspectRatio="690:320">
-                                            <shci:CachedImage Source="{Binding SelectedHistoryWish.BannerImage}"/>
-                                        </cwc:ConstrainedBox>
+                                        cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
+                                        <Border HorizontalAlignment="Center" Style="{StaticResource BorderCardStyle}">
+                                            <cwc:ConstrainedBox MaxWidth="720" AspectRatio="1080:533">
+                                                <shci:CachedImage
+                                                    HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"
+                                                    CornerRadius="{ThemeResource ControlCornerRadius}"
+                                                    Source="{Binding SelectedHistoryWish.BannerImage}"
+                                                    Stretch="UniformToFill"/>
+                                            </cwc:ConstrainedBox>
+                                        </Border>
                                     </Border>
 
+
+
                                     <TextBlock
                                         Margin="0,16,0,8"
                                         Style="{StaticResource BaseTextBlockStyle}"
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml
index b63bc96c..7270a3d5 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/SettingPage.xaml
@@ -2,6 +2,7 @@
     x:Class="Snap.Hutao.View.Page.SettingPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:cw="using:CommunityToolkit.WinUI"
     xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -19,8 +20,8 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <StackPanel Margin="16,16,16,16" Spacing="{StaticResource SettingsCardSpacing}">
-                <Border Height="280" Style="{StaticResource BorderCardStyle}">
-                    <Grid>
+                <Border cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
+                    <Grid Height="280" Style="{ThemeResource BorderGridStyle}">
                         <Image
                             VerticalAlignment="Center"
                             Source="ms-appx:///Resource/BlurBackground.png"
@@ -67,6 +68,7 @@
                         </Grid>
                     </Grid>
                 </Border>
+
                 <TextBlock
                     Grid.Row="0"
                     Margin="0,4"
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml
index b49b339c..3af94fb4 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiAvatarPage.xaml
@@ -2,6 +2,7 @@
     x:Class="Snap.Hutao.View.Page.WikiAvatarPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:cw="using:CommunityToolkit.WinUI"
     xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -421,24 +422,30 @@
                                             Margin="16,32,0,0"
                                             Style="{StaticResource BaseTextBlockStyle}"
                                             Text="{shcm:ResourceString Name=ViewPageWiKiAvatarMiscHeader}"/>
-                                        <cwc:ConstrainedBox AspectRatio="2048:1024">
-                                            <Grid Margin="16,16,0,0" Style="{StaticResource BorderGridStyle}">
-                                                <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="auto"/>
-                                                    <ColumnDefinition/>
-                                                </Grid.ColumnDefinitions>
+                                        <Border Margin="16,16,0,0" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
+                                            <cwc:ConstrainedBox AspectRatio="2048:1024">
+                                                <Grid Style="{StaticResource BorderGridStyle}">
+                                                    <Grid.ColumnDefinitions>
+                                                        <ColumnDefinition Width="auto"/>
+                                                        <ColumnDefinition/>
+                                                    </Grid.ColumnDefinitions>
 
-                                                <shci:CachedImage
-                                                    Grid.ColumnSpan="2"
-                                                    HorizontalAlignment="Center"
-                                                    VerticalAlignment="Stretch"
-                                                    Source="{Binding Selected.Icon, Converter={StaticResource GachaAvatarImgConverter}}"/>
+                                                    <shci:CachedImage
+                                                        Grid.ColumnSpan="2"
+                                                        HorizontalAlignment="Center"
+                                                        VerticalAlignment="Stretch"
+                                                        Source="{Binding Selected.Icon, Converter={StaticResource GachaAvatarImgConverter}}"/>
+
+                                                    <Border Margin="16" Style="{StaticResource BorderCardStyle}">
+                                                        <shci:CachedImage
+                                                            HorizontalAlignment="Stretch"
+                                                            CornerRadius="{ThemeResource ControlCornerRadius}"
+                                                            Source="{Binding Selected.Icon, Converter={StaticResource GachaAvatarIconConverter}}"/>
+                                                    </Border>
+                                                </Grid>
+                                            </cwc:ConstrainedBox>
+                                        </Border>
 
-                                                <Border Margin="16" Style="{StaticResource BorderCardStyle}">
-                                                    <shci:CachedImage HorizontalAlignment="Stretch" Source="{Binding Selected.Icon, Converter={StaticResource GachaAvatarIconConverter}}"/>
-                                                </Border>
-                                            </Grid>
-                                        </cwc:ConstrainedBox>
 
                                         <!--  料理  -->
                                         <Expander
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
index 50253653..2d5b567b 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/WikiWeaponPage.xaml
@@ -2,6 +2,7 @@
     x:Class="Snap.Hutao.View.Page.WikiWeaponPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:cw="using:CommunityToolkit.WinUI"
     xmlns:cwc="using:CommunityToolkit.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -120,54 +121,57 @@
                                     MaxWidth="800"
                                     Margin="0,0,16,0"
                                     HorizontalAlignment="Left">
-                                    <Border Margin="16,16,0,0" Style="{ThemeResource BorderCardStyle}">
-                                        <Border.Background>
-                                            <ImageBrush ImageSource="ms-appx:///Resource/Icon/UI_GachaShowPanel_Bg_Weapon.png"/>
-                                        </Border.Background>
-                                        <Grid>
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="auto"/>
-                                                <ColumnDefinition/>
-                                            </Grid.ColumnDefinitions>
-                                            <mxi:Interaction.Behaviors>
-                                                <shcb:AutoHeightBehavior TargetHeight="1024" TargetWidth="2048"/>
-                                            </mxi:Interaction.Behaviors>
-                                            <Border Grid.ColumnSpan="2" Background="{ThemeResource DarkOnlyOverlayMaskBrush}"/>
-                                            <ScrollViewer
-                                                Grid.Column="0"
-                                                Margin="16"
-                                                VerticalScrollBarVisibility="Hidden">
-                                                <StackPanel>
-                                                    <shvc:BottomTextControl MaxWidth="80" Text="{shcm:ResourceString Name=ViewPageWiKiWeaponBeforeAscensionTitle}">
-                                                        <shvc:ItemIcon Icon="{Binding Selected.Icon, Converter={StaticResource EquipIconConverter}}" Quality="{Binding Selected.RankLevel}"/>
-                                                    </shvc:BottomTextControl>
-
-                                                    <shvc:BottomTextControl Margin="0,16,0,0" Text="{shcm:ResourceString Name=ViewPageWiKiWeaponAfterAscensionTitle}">
-                                                        <shvc:ItemIcon Icon="{Binding Selected.AwakenIcon, Converter={StaticResource EquipIconConverter}}" Quality="{Binding Selected.RankLevel}"/>
-                                                    </shvc:BottomTextControl>
-                                                </StackPanel>
-                                            </ScrollViewer>
-
-                                            <Grid Grid.ColumnSpan="2">
+                                    <Border Margin="16,16,0,0" cw:Effects.Shadow="{ThemeResource CompatCardShadow}">
+                                        <Border Style="{ThemeResource BorderCardStyle}">
+                                            <Border.Background>
+                                                <ImageBrush ImageSource="ms-appx:///Resource/Icon/UI_GachaShowPanel_Bg_Weapon.png"/>
+                                            </Border.Background>
+                                            <Grid>
                                                 <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="176*"/>
-                                                    <ColumnDefinition Width="848*"/>
+                                                    <ColumnDefinition Width="auto"/>
+                                                    <ColumnDefinition/>
                                                 </Grid.ColumnDefinitions>
-                                                <shci:CachedImage
+                                                <mxi:Interaction.Behaviors>
+                                                    <shcb:AutoHeightBehavior TargetHeight="1024" TargetWidth="2048"/>
+                                                </mxi:Interaction.Behaviors>
+                                                <Border Grid.ColumnSpan="2" Background="{ThemeResource DarkOnlyOverlayMaskBrush}"/>
+                                                <ScrollViewer
+                                                    Grid.Column="0"
+                                                    Margin="16"
+                                                    VerticalScrollBarVisibility="Hidden">
+                                                    <StackPanel>
+                                                        <shvc:BottomTextControl MaxWidth="80" Text="{shcm:ResourceString Name=ViewPageWiKiWeaponBeforeAscensionTitle}">
+                                                            <shvc:ItemIcon Icon="{Binding Selected.Icon, Converter={StaticResource EquipIconConverter}}" Quality="{Binding Selected.RankLevel}"/>
+                                                        </shvc:BottomTextControl>
+
+                                                        <shvc:BottomTextControl Margin="0,16,0,0" Text="{shcm:ResourceString Name=ViewPageWiKiWeaponAfterAscensionTitle}">
+                                                            <shvc:ItemIcon Icon="{Binding Selected.AwakenIcon, Converter={StaticResource EquipIconConverter}}" Quality="{Binding Selected.RankLevel}"/>
+                                                        </shvc:BottomTextControl>
+                                                    </StackPanel>
+                                                </ScrollViewer>
+
+                                                <Grid Grid.ColumnSpan="2">
+                                                    <Grid.ColumnDefinitions>
+                                                        <ColumnDefinition Width="176*"/>
+                                                        <ColumnDefinition Width="848*"/>
+                                                    </Grid.ColumnDefinitions>
+                                                    <shci:CachedImage
+                                                        Grid.Column="1"
+                                                        HorizontalAlignment="Center"
+                                                        VerticalAlignment="Stretch"
+                                                        Source="{Binding Selected.Icon, Converter={StaticResource GachaEquipIconConverter}}"/>
+                                                </Grid>
+                                                <TextBlock
                                                     Grid.Column="1"
-                                                    HorizontalAlignment="Center"
-                                                    VerticalAlignment="Stretch"
-                                                    Source="{Binding Selected.Icon, Converter={StaticResource GachaEquipIconConverter}}"/>
+                                                    Margin="16"
+                                                    HorizontalAlignment="Right"
+                                                    VerticalAlignment="Bottom"
+                                                    Style="{StaticResource SubtitleTextBlockStyle}"
+                                                    Text="{Binding Selected.Name}"/>
                                             </Grid>
-                                            <TextBlock
-                                                Grid.Column="1"
-                                                Margin="16"
-                                                HorizontalAlignment="Right"
-                                                VerticalAlignment="Bottom"
-                                                Style="{StaticResource SubtitleTextBlockStyle}"
-                                                Text="{Binding Selected.Name}"/>
-                                        </Grid>
+                                        </Border>
                                     </Border>
+
                                     <TextBlock
                                         Margin="16,16,0,0"
                                         Text="{Binding Selected.Description}"