From afb0307647785dc2113b0c2151614cb6f7392808 Mon Sep 17 00:00:00 2001
From: lim <lim@keepourfaith.com>
Date: Thu, 29 Sep 2022 14:10:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=97=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Lux_GUI/PlayList.xaml      | 12 ++++++------
 Lux_GUI/SingleFile.xaml    | 30 ++++++++++++++++++++++--------
 Lux_GUI/SingleFile.xaml.cs |  1 +
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/Lux_GUI/PlayList.xaml b/Lux_GUI/PlayList.xaml
index a10b508..5d69bc4 100644
--- a/Lux_GUI/PlayList.xaml
+++ b/Lux_GUI/PlayList.xaml
@@ -38,7 +38,7 @@
                         <Setter.Value>
                             <ControlTemplate TargetType="{x:Type DataGridCell}">
                                 <Grid Background="{TemplateBinding Background}">
-                                    <ContentPresenter HorizontalAlignment="Left" VerticalAlignment="Center" />
+                                    <ContentPresenter HorizontalAlignment="Left" Margin="13,0" VerticalAlignment="Center" />
                                 </Grid>
                             </ControlTemplate>
                         </Setter.Value>
@@ -46,11 +46,11 @@
                 </Style>
             </DataGrid.Resources>
             <DataGrid.Columns>
-                <DataGridTextColumn Header="网站" Binding="{Binding Site}" MinWidth="200" Width="auto" IsReadOnly="True"  />
-                <DataGridTextColumn Header="标题" Binding="{Binding Title}" MinWidth="300" Width="*" IsReadOnly="True" />
-                <DataGridTextColumn Header="流名称" Binding="{Binding Name}" MinWidth="50" Width="auto" IsReadOnly="True" />
-                <DataGridTextColumn Header="质量" Binding="{Binding Quality}" MinWidth="200" Width="auto" IsReadOnly="True" />
-                <DataGridTextColumn Header="大小" Binding="{Binding Size}" MinWidth="200" Width="auto" IsReadOnly="True" />
+                <!--<DataGridTextColumn Header="网站" Binding="{Binding Site}" MinWidth="200" Width="auto" IsReadOnly="True"  />-->
+                <DataGridTextColumn Header="标题" Binding="{Binding Title}" Width="3*" IsReadOnly="True" />
+                <DataGridTextColumn Header="流名称" Binding="{Binding Name}" Width="150" IsReadOnly="True" />
+                <DataGridTextColumn Header="质量" Binding="{Binding Quality}" Width="*" IsReadOnly="True" />
+                <DataGridTextColumn Header="大小" Binding="{Binding Size}" Width="*" IsReadOnly="True" />
             </DataGrid.Columns>
         </DataGrid>
         <StackPanel  Grid.Row="1"  Margin="10,5" VerticalAlignment="Center" Orientation="Horizontal" Height="auto">
diff --git a/Lux_GUI/SingleFile.xaml b/Lux_GUI/SingleFile.xaml
index d56b18e..c652d4c 100644
--- a/Lux_GUI/SingleFile.xaml
+++ b/Lux_GUI/SingleFile.xaml
@@ -25,13 +25,13 @@
             <RowDefinition Height="50" />
         </Grid.RowDefinitions>
 
-        <DataGrid Grid.Row="0" ItemsSource="{Binding StreamsView,Mode=OneWay}" AutoGenerateColumns="False" RowHeight="50">
+        <DataGrid Grid.Row="0" ItemsSource="{Binding StreamsView,Mode=OneWay}" AutoGenerateColumns="False" RowHeight="50" x:Name="datagrid">
             <DataGrid.Resources>
                 <Style TargetType="TextBlock" BasedOn="{StaticResource MaterialDesignBody1TextBlock}" x:Key="vCenter">
                     <Setter Property="VerticalAlignment" Value="Center"/>
                 </Style>
 
-                <Style TargetType="DataGridCell" BasedOn="{StaticResource MaterialDesignDataGridCell}">
+                <!--<Style TargetType="DataGridCell" BasedOn="{StaticResource MaterialDesignDataGridCell}">
                     <Setter Property="FocusVisualStyle" Value="{x:Null}" />
                     <Setter Property="BorderThickness" Value="0"/>
                     <Setter Property="Template">
@@ -43,15 +43,29 @@
                             </ControlTemplate>
                         </Setter.Value>
                     </Setter>
+                </Style>-->
+
+                <Style TargetType="DataGridCell" BasedOn="{StaticResource MaterialDesignDataGridCell}">
+                    <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+                    <Setter Property="BorderThickness" Value="0"/>
+                    <Setter Property="Template">
+                        <Setter.Value>
+                            <ControlTemplate TargetType="{x:Type DataGridCell}">
+                                <Grid Background="{TemplateBinding Background}">
+                                    <ContentPresenter HorizontalAlignment="Left" Margin="13,0" VerticalAlignment="Center" />
+                                </Grid>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
                 </Style>
             </DataGrid.Resources>
             <DataGrid.Columns>
-                <DataGridTextColumn Header="网站" Binding="{Binding Site}" MinWidth="200" Width="auto" IsReadOnly="True"  />
-                <DataGridTextColumn Header="标题" Binding="{Binding Title}" MinWidth="300" Width="*" IsReadOnly="True" />
-                <DataGridTextColumn Header="流名称" Binding="{Binding Name}" MinWidth="50" Width="auto" IsReadOnly="True" />
-                <DataGridTextColumn Header="质量" Binding="{Binding Quality}" MinWidth="200" Width="auto" IsReadOnly="True" />
-                <DataGridTextColumn Header="大小" Binding="{Binding Size}" MinWidth="200" Width="auto" IsReadOnly="True" />
-                <DataGridTemplateColumn Header="操作" Width="80">
+                <!--<DataGridTextColumn Header="网站" Binding="{Binding Site}" Width="*" IsReadOnly="True"  />
+                <DataGridTextColumn Header="标题" Binding="{Binding Title}" Width="3*" IsReadOnly="True" />-->
+                <DataGridTextColumn Header="流名称" Binding="{Binding Name}" Width="150" IsReadOnly="True" />
+                <DataGridTextColumn Header="质量" Binding="{Binding Quality}" Width="*" IsReadOnly="True" />
+                <DataGridTextColumn Header="大小" Binding="{Binding Size}" Width="*" IsReadOnly="True" />
+                <DataGridTemplateColumn Header="操作" Width="120">
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
                             <Button Content="下载" Style="{StaticResource MaterialDesignFlatAccentButton}" Margin="3,1" Click="BtnAction_Click" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
diff --git a/Lux_GUI/SingleFile.xaml.cs b/Lux_GUI/SingleFile.xaml.cs
index d344bf1..0fc6add 100644
--- a/Lux_GUI/SingleFile.xaml.cs
+++ b/Lux_GUI/SingleFile.xaml.cs
@@ -135,6 +135,7 @@ public void Parser(string InputUrl)
                 {
                     this.Dispatcher.BeginInvoke(new Action(() =>
                     {
+                        datagrid.UpdateLayout();
                         DialogHost.Close("RootDialog");
                         ComboboxView.Refresh();
                     }));