update and fix window

kikipoulet · Jul 9, 2024 · fba9d13 · fba9d13
1 parent 5372a5b
commit fba9d13
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 15 deletions.
diff --git a/SukiUI.Demo/SukiUI.Demo.csproj b/SukiUI.Demo/SukiUI.Demo.csproj
@@ -9,19 +9,19 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Avalonia" Version="11.1.0-rc1" />
+		<PackageReference Include="Avalonia" Version="11.1.0-rc2" />
 		<PackageReference Include="Avalonia.AvaloniaEdit" Version="11.0.6" />
-		<PackageReference Include="Avalonia.Desktop" Version="11.1.0-rc1" />
-		<PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.0-rc1" />
+		<PackageReference Include="Avalonia.Desktop" Version="11.1.0-rc2" />
+		<PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.0-rc2" />
 		<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.0-rc1" />
-		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.0-rc1" />
+		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.0-rc2" />
+		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.0-rc2" />
 		<PackageReference Include="AvaloniaEdit.TextMate" Version="11.0.6" />
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
 		<PackageReference Include="Dock.Avalonia" Version="11.1.0-rc1" />
 		<PackageReference Include="Dock.Model" Version="11.1.0-rc1" />
 		<PackageReference Include="Dock.Model.Avalonia" Version="11.1.0-rc1" />
-		<PackageReference Include="Material.Icons.Avalonia" Version="2.1.9" />
+		<PackageReference Include="Material.Icons.Avalonia" Version="2.1.10" />
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0-preview.3.24172.9" />
 		<PackageReference Include="ShowMeTheXaml.Avalonia" Version="1.5.1" />
 		<PackageReference Include="ShowMeTheXaml.Avalonia.Generator" Version="1.5.1" />

diff --git a/SukiUI.Dock/SukiUI.Dock.csproj b/SukiUI.Dock/SukiUI.Dock.csproj
@@ -5,7 +5,8 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <Version>6.0.0</Version>
+        <Version>6.0.0-beta7</Version>
+        <PackageIcon>OIG.N5o-removebg-preview.png</PackageIcon>
     </PropertyGroup>
 
     <ItemGroup>
@@ -17,4 +18,11 @@
       <PackageReference Include="Dock.Model.Avalonia" Version="11.1.0-rc1" />
     </ItemGroup>
 
+    <ItemGroup>
+      <None Update="OIG.N5o-removebg-preview.png">
+        <Pack>True</Pack>
+        <PackagePath></PackagePath>
+      </None>
+    </ItemGroup>
+
 </Project>
diff --git a/SukiUI/Controls/SukiWindow.axaml b/SukiUI/Controls/SukiWindow.axaml
@@ -4,7 +4,7 @@
                     xmlns:suki="clr-namespace:SukiUI.Controls">
     <ControlTheme x:Key="SukiWindowTheme" TargetType="suki:SukiWindow">
         <Setter Property="Margin" Value="0" />
-        <Setter Property="SystemDecorations" Value="BorderOnly" />
+        <Setter Property="SystemDecorations" Value="Full" />
         <Setter Property="ExtendClientAreaChromeHints" Value="NoChrome" />
         <Setter Property="ExtendClientAreaTitleBarHeightHint" Value="-1" />
         <Setter Property="ExtendClientAreaToDecorationsHint" Value="True" />

diff --git a/SukiUI/Controls/SukiWindow.axaml.cs b/SukiUI/Controls/SukiWindow.axaml.cs
@@ -250,7 +250,10 @@ protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
             }
 
             if (e.NameScope.Get<Button>("PART_MinimizeButton") is { } minimize)
-                minimize.Click += (_, _) => WindowState = WindowState.Minimized;
+                minimize.Click += (_, _) =>
+                {
+                    WindowState = WindowState.Minimized;
+                };
 
             if (e.NameScope.Get<Button>("PART_CloseButton") is { } close)
                 close.Click += (_, _) => Close();

diff --git a/SukiUI/SukiUI.csproj b/SukiUI/SukiUI.csproj
@@ -21,19 +21,19 @@
 		<LangVersion>10</LangVersion>
 		<UserSecretsId>712f85e4-12d3-41b0-a417-5714a113666f</UserSecretsId>
 		<Description>https://github.com/kikipoulet/SukiUI</Description>
-		<PackageVersion>6.0.0</PackageVersion>
+		<PackageVersion>6.0.0-beta7</PackageVersion>
 		<Nullable>enable</Nullable>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<PackageIcon>OIG.N5o-removebg-preview.png</PackageIcon>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Avalonia" Version="11.1.0-rc1" />
-		<PackageReference Include="Avalonia.Skia" Version="11.1.0-rc1" />
+		<PackageReference Include="Avalonia" Version="11.1.0-rc2" />
+		<PackageReference Include="Avalonia.Skia" Version="11.1.0-rc2" />
 		<PackageReference Include="SkiaSharp" Version="2.88.8" />
-		<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.1.0-rc1" />
-		<PackageReference Include="Avalonia.Themes.Simple" Version="11.1.0-rc1" />
-		<PackageReference Include="ReactiveUI" Version="19.6.12" />
+		<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.1.0-rc2" />
+		<PackageReference Include="Avalonia.Themes.Simple" Version="11.1.0-rc2" />
+		<PackageReference Include="ReactiveUI" Version="20.1.1" />
 	</ItemGroup>
 
 	<ItemGroup>