From 5851faa437c1b060de7ca511b42722dc35b071dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E5=BD=AA?= <1315508912@qq.com>
Date: Tue, 12 Dec 2023 00:07:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dui=E4=B8=8A=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DownloadManager/ViewDownloading.axaml     | 13 ----
 DownKyi/Views/Settings/ViewNetwork.axaml      | 30 +++++---
 DownKyi/Views/ViewVideoDetail.axaml           | 72 +++++++++++++++++++
 3 files changed, 91 insertions(+), 24 deletions(-)

diff --git a/DownKyi/Views/DownloadManager/ViewDownloading.axaml b/DownKyi/Views/DownloadManager/ViewDownloading.axaml
index 46e8855..d6ff3c5 100644
--- a/DownKyi/Views/DownloadManager/ViewDownloading.axaml
+++ b/DownKyi/Views/DownloadManager/ViewDownloading.axaml
@@ -104,19 +104,6 @@
                                                 FontSize="12"
                                                 Foreground="{DynamicResource BrushTextDark}"
                                                 Text="{Binding StringFormat={} {0}, Path=DownloadStatusTitle}">
-
-                                                <!--<TextBlock.Style>
-                                                    <Style TargetType="{x:Type TextBlock}">
-                                                        <Setter Property="Text"
-                                                                Value="{Binding StringFormat={} {0}, Path=DownloadStatusTitle}" />
-                                                        <Style.Triggers>
-                                                            <DataTrigger Binding="{Binding DownloadContent}" Value="">
-                                                                <Setter Property="Text"
-                                                                        Value="{Binding DownloadStatusTitle}" />
-                                                            </DataTrigger>
-                                                        </Style.Triggers>
-                                                    </Style>
-                                                </TextBlock.Style>-->
                                                 <i:Interaction.Behaviors>
                                                     <ia:DataTriggerBehavior Binding="{Binding DownloadContent}"
                                                                             Value="">
diff --git a/DownKyi/Views/Settings/ViewNetwork.axaml b/DownKyi/Views/Settings/ViewNetwork.axaml
index d1457c5..13318cd 100644
--- a/DownKyi/Views/Settings/ViewNetwork.axaml
+++ b/DownKyi/Views/Settings/ViewNetwork.axaml
@@ -6,7 +6,8 @@
              xmlns:prism="http://prismlibrary.com/"
              prism:ViewModelLocator.AutoWireViewModel="True"
              xmlns:i="using:Avalonia.Xaml.Interactivity"
-             xmlns:ia="clr-namespace:Avalonia.Xaml.Interactions.Core;assembly=Avalonia.Xaml.Interactions">
+             xmlns:ia="clr-namespace:Avalonia.Xaml.Interactions.Core;assembly=Avalonia.Xaml.Interactions"
+             xmlns:iac="clr-namespace:DownKyi.CustomAction">
     <ScrollViewer>
         <StackPanel Margin="50,0" Orientation="Vertical">
             <StackPanel Margin="0,20,0,0" Orientation="Horizontal">
@@ -17,7 +18,7 @@
             </StackPanel>
 
             <CheckBox
-                Name="nameUseSSL"
+                Name="NameUseSsl"
                 Margin="0,20,0,0"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Top"
@@ -26,7 +27,7 @@
                 FontSize="12"
                 Foreground="{DynamicResource BrushTextDark}"
                 IsChecked="{Binding UseSSL, Mode=TwoWay}"
-                Theme="{StaticResource CheckBoxStyle}"/>
+                Theme="{StaticResource CheckBoxStyle}" />
 
             <TextBlock
                 Margin="0,20,0,0"
@@ -35,11 +36,18 @@
                 Text="{DynamicResource UserAgent}" />
 
             <TextBox
-                Name="nameUserAgent"
+                Name="NameUserAgent"
                 Height="25"
                 Margin="0,10,0,0"
                 HorizontalAlignment="Stretch"
-                Text="{Binding UserAgent}"/>
+                Text="{Binding UserAgent}">
+                <i:Interaction.Behaviors>
+                    <iac:KeyUpBehavior Key="Enter">
+                        <ia:InvokeCommandAction Command="{Binding UserAgentCommand}"
+                                                CommandParameter="{Binding ElementName=NameUserAgent,Path=Text}" />
+                    </iac:KeyUpBehavior>
+                </i:Interaction.Behaviors>
+            </TextBox>
 
             <StackPanel Margin="0,20,0,0" Orientation="Vertical">
                 <TextBlock
@@ -80,7 +88,7 @@
                 Margin="0,20,0,0"
                 Background="{DynamicResource BrushBorder}" />
 
-            <StackPanel x:Name="nameBuiltin">
+            <StackPanel x:Name="NameBuiltin">
                 <i:Interaction.Behaviors>
                     <ia:DataTriggerBehavior Binding="{Binding Builtin}" Value="True">
                         <ia:ChangePropertyAction PropertyName="IsVisible" Value="True" />
@@ -97,7 +105,7 @@
                         Foreground="{DynamicResource BrushTextDark}"
                         Text="{DynamicResource MaxCurrentDownloads}" />
                     <ComboBox
-                        Name="nameMaxCurrentDownloads"
+                        Name="NameMaxCurrentDownloads"
                         Width="100"
                         VerticalContentAlignment="Center"
                         ItemsSource="{Binding MaxCurrentDownloads}"
@@ -105,7 +113,7 @@
                         <i:Interaction.Behaviors>
                             <ia:EventTriggerBehavior EventName="SelectionChanged">
                                 <ia:InvokeCommandAction Command="{Binding MaxCurrentDownloadsCommand}"
-                                                        CommandParameter="{Binding ElementName=nameMaxCurrentDownloads, Path=SelectedValue}" />
+                                                        CommandParameter="{Binding ElementName=NameMaxCurrentDownloads, Path=SelectedValue}" />
                             </ia:EventTriggerBehavior>
                         </i:Interaction.Behaviors>
                     </ComboBox>
@@ -119,7 +127,7 @@
                         Foreground="{DynamicResource BrushTextDark}"
                         Text="{DynamicResource Split}" />
                     <ComboBox
-                        Name="nameSplits"
+                        Name="NameSplits"
                         Width="100"
                         VerticalContentAlignment="Center"
                         ItemsSource="{Binding Splits}"
@@ -127,14 +135,14 @@
                         <i:Interaction.Behaviors>
                             <ia:EventTriggerBehavior EventName="SelectionChanged">
                                 <ia:InvokeCommandAction Command="{Binding SplitsCommand}"
-                                                        CommandParameter="{Binding ElementName=nameSplits, Path=SelectedValue}" />
+                                                        CommandParameter="{Binding ElementName=NameSplits, Path=SelectedValue}" />
                             </ia:EventTriggerBehavior>
                         </i:Interaction.Behaviors>
                     </ComboBox>
                 </StackPanel>
 
                 <CheckBox
-                    Name="nameIsHttpProxy"
+                    Name="NameIsHttpProxy"
                     Margin="0,20,0,0"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Top"
diff --git a/DownKyi/Views/ViewVideoDetail.axaml b/DownKyi/Views/ViewVideoDetail.axaml
index 49241e7..f63f5f4 100644
--- a/DownKyi/Views/ViewVideoDetail.axaml
+++ b/DownKyi/Views/ViewVideoDetail.axaml
@@ -286,15 +286,82 @@
                     BorderThickness="1"
                     BorderBrush="Gray"
                     CanUserSortColumns="False"
+                    CanUserResizeColumns="True"
                     IsReadOnly="True"
                     ItemsSource="{ReflectionBinding ElementName=NameVideoSections,Path=SelectedItem.VideoPages,Mode=TwoWay}"
                     SelectionMode="Extended">
+                    <DataGrid.ColumnHeaderTheme>
+                        <ControlTheme TargetType="{x:Type DataGridColumnHeader}">
+                            <Setter Property="Background" Value="{DynamicResource BrushHeaderGrey}" />
+                            <Setter Property="HorizontalContentAlignment" Value="Center"></Setter>
+                            <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
+                            <Setter Property="Template">
+                                <Setter.Value>
+                                    <ControlTemplate TargetType="{x:Type DataGridColumnHeader}">
+                                        <Grid>
+                                            <Border
+                                                x:Name="HeaderBorder"
+                                                Height="30"
+                                                Background="{TemplateBinding Background}"
+                                                BorderBrush="{TemplateBinding BorderBrush}">
+                                                <Grid>
+                                                    <Grid.RowDefinitions>
+                                                        <RowDefinition MaxHeight="10" />
+                                                        <RowDefinition />
+                                                    </Grid.RowDefinitions>
+                                                    <Border Grid.RowSpan="2" Padding="{TemplateBinding Padding}">
+                                                        <ContentPresenter
+                                                            x:Name="HeaderContent"
+                                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                            Content="{TemplateBinding Content}"
+                                                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                            RecognizesAccessKey="True" />
+                                                    </Border>
+                                                </Grid>
+                                            </Border>
+                                            <Canvas>
+                                                <Thumb x:Name="PART_HeaderGripper">
+                                                    <Thumb.Theme>
+                                                        <ControlTheme TargetType="{x:Type Thumb}">
+                                                            <Setter Property="Canvas.Right" Value="-9" />
+                                                            <Setter Property="Width" Value="18" />
+                                                            <Setter Property="Height"
+                                                                    Value="{Binding Bounds.Size.Height, RelativeSource={RelativeSource TemplatedParent}}" />
+                                                            <Setter Property="Padding" Value="0" />
+                                                            <Setter Property="Background" Value="White" />
+                                                            <Setter Property="Template">
+                                                                <Setter.Value>
+                                                                    <ControlTemplate TargetType="{x:Type Thumb}">
+                                                                        <Border Padding="{TemplateBinding Padding}"
+                                                                            Background="Transparent">
+                                                                            <Rectangle
+                                                                                Width="1"
+                                                                                HorizontalAlignment="Center"
+                                                                                Fill="{TemplateBinding Background}" />
+                                                                        </Border>
+                                                                    </ControlTemplate>
+                                                                </Setter.Value>
+                                                            </Setter>
+                                                        </ControlTheme>
+                                                    </Thumb.Theme>
+                                                </Thumb>
+                                            </Canvas>
+                                        </Grid>
+                                    </ControlTemplate>
+                                </Setter.Value>
+                            </Setter>
+                        </ControlTheme>
+                    </DataGrid.ColumnHeaderTheme>
                     <i:Interaction.Behaviors>
                         <ia:EventTriggerBehavior EventName="SelectionChanged">
                             <ia:InvokeCommandAction Command="{Binding VideoPagesCommand}"
                                                     CommandParameter="{Binding ElementName=NameVideoPages1,Path=SelectedItems}" />
                         </ia:EventTriggerBehavior>
                     </i:Interaction.Behaviors>
+                    <DataGrid.RowTheme>
+                        
+                    </DataGrid.RowTheme>
                     <DataGrid.Columns>
                         <DataGridTextColumn
                             Width="50"
@@ -386,6 +453,11 @@
                         Watermark="{DynamicResource SearchVideoByName}"
                         Text="{Binding Path=InputSearchText, Mode=TwoWay}"
                         TextWrapping="Wrap">
+                        <i:Interaction.Behaviors>
+                            <iac:KeyUpBehavior Key="Enter">
+                                <ia:InvokeCommandAction Command="{Binding InputSearchCommand}" />
+                            </iac:KeyUpBehavior>
+                        </i:Interaction.Behaviors>
                     </TextBox>
                     <Button
                         Grid.Column="4"