Merge branch 'develop'

Author: Harlan-H

Changelog.md

@@ -1,3 +1,6 @@
+# 3.12.8 (2023/04/05)
+ - 界面不在限制大小，可以自由拖拽大小
+
 # 3.12.7 (2022/12/29)
  - 修改直播延迟逻辑
  - 修改直播缓存命名方式,以支持文件夹快速合并方案

M3u8Downloader_H.Core/M3u8Downloader_H.Core.csproj

@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-	<Version>3.12.7.0</Version>
+	<Version>3.12.8.0</Version>
     <Authors>Harlan</Authors>
-    <AssemblyVersion>3.12.7.0</AssemblyVersion>
+    <AssemblyVersion>3.12.8.0</AssemblyVersion>
   </PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)'=='Release'">

M3u8Downloader_H.M3U8/M3u8Downloader_H.M3U8.csproj

@@ -3,8 +3,8 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-    <AssemblyVersion>3.12.7.0</AssemblyVersion>
-    <Version>3.12.7.0</Version>
+    <AssemblyVersion>3.12.8.0</AssemblyVersion>
+    <Version>3.12.8.0</Version>
   </PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)'=='Release'">

M3u8Downloader_H.PluginManager/M3u8Downloader_H.PluginManager.csproj

@@ -5,7 +5,7 @@
     <TargetFramework>net6.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
-	<Version>3.12.7.0</Version>	  
+	<Version>3.12.8.0</Version>	  
     <ApplicationIcon>icon.ico</ApplicationIcon>
   </PropertyGroup>
 

M3u8Downloader_H/M3u8Downloader_H.csproj

@@ -7,8 +7,8 @@
     <UseWindowsForms>true</UseWindowsForms>
     <RootNamespace>M3u8Downloader_H</RootNamespace>
     <Platforms>AnyCPU;x64</Platforms>
-    <AssemblyVersion>3.12.7.0</AssemblyVersion>
-    <Version>3.12.7.0</Version>
+    <AssemblyVersion>3.12.8.0</AssemblyVersion>
+    <Version>3.12.8.0</Version>
     <PackageId>m3u8视频下载器</PackageId>
     <Product>m3u8视频下载器</Product>
     <ApplicationIcon>icon.ico</ApplicationIcon>

M3u8Downloader_H/Views/MainWindowView.xaml

@@ -14,8 +14,7 @@
         d:DataContext="{d:DesignInstance Type=local:MainWindowViewModel}"
         WindowStartupLocation="CenterScreen"
         WindowStyle="None"
-        MinHeight="480" MinWidth="700"
-        MaxHeight="480" MaxWidth="700"
+        MinHeight="480" MinWidth="700" 
         Height="480" Width="700">
 
     <i:Interaction.Behaviors>
@@ -99,8 +98,8 @@
                 <!--  操作区 -->
                 <Grid Grid.Row="0" Height="95" Name="videoDownloadInfoGrid" DataContext="{Binding VideoDownloadInfo}">
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="4*" />
-                        <ColumnDefinition />
+                        <ColumnDefinition  />
+                        <ColumnDefinition Width="auto" />
                     </Grid.ColumnDefinitions>
                     <StackPanel >
                         <TextBox Text="{Binding RequestUrl,Delay=150}" Margin="8" 
@@ -139,7 +138,7 @@
                     </StackPanel>
                     <Grid Grid.Column="1" >
                         <Button cal:Message.Attach="ProcessDownload($DataContext)"
-                            Margin="5" materialDesign:ShadowAssist.ShadowDepth="Depth2" >
+                            Margin="5" Width="150" materialDesign:ShadowAssist.ShadowDepth="Depth2" >
                             <materialDesign:PackIcon Kind="Download" Width="24" Height="24" />
                         </Button>
                     </Grid>
@@ -152,6 +151,7 @@
                     <StackPanel
                         Margin="8,10,8,8"
                         HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
                         Visibility="{Binding Downloads.Count, Converter={x:Static converters:IntToInverseBoolVisibilityConverter.Instance}}">
                         <Image Source="pack://application:,,,/icon.ico" 
                                             Width="160"