diff options
| author | Jean-Philippe Bruyère <jp_bruyere@hotmail.com> | 2021-08-21 00:29:44 +0200 |
|---|---|---|
| committer | Jean-Philippe Bruyère <jp_bruyere@hotmail.com> | 2021-08-21 00:29:44 +0200 |
| commit | 850fa1b8ae100eda9656c2cdab56e74203da2d37 (patch) | |
| tree | d3e0e6231f3f71635618f6bb6521c7b60eb90b98 | |
| parent | c0a6bb6ae6db8f4de39b630a2f5e20c3f976e6a9 (diff) | |
update to crow-9.5-beta
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | CrowWindow/CrowWindow.csproj | 4 | ||||
| -rw-r--r-- | CrowWindow/VkCrowWindow.cs | 5 | ||||
| -rw-r--r-- | FUNDING.yml | 1 | ||||
| -rw-r--r-- | src/BoardWidget.cs | 2 | ||||
| -rw-r--r-- | ui/promote.crow | 6 | ||||
| -rw-r--r-- | vkChess.net.csproj | 3 |
7 files changed, 13 insertions, 9 deletions
@@ -4,3 +4,4 @@ bin .vs .vscode *.user +Releases diff --git a/CrowWindow/CrowWindow.csproj b/CrowWindow/CrowWindow.csproj index f579535..e667345 100644 --- a/CrowWindow/CrowWindow.csproj +++ b/CrowWindow/CrowWindow.csproj @@ -4,7 +4,7 @@ <AssemblyName>CrowWindow</AssemblyName> <TargetFrameworks>netstandard2.1</TargetFrameworks> <IncludeDefaultNoneItems>false</IncludeDefaultNoneItems> - <Description>vke.net addon to creaet a vulkan window with crow gui support.</Description> + <Description>vke.net addon to creaet a vulkan window with C.R.O.W. gui support.</Description> <PackageTags>vulkan gui ui c# vke.net</PackageTags> <License>MIT</License> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> @@ -15,7 +15,7 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="Crow" Version="0.9.3-beta" /> + <PackageReference Include="Crow" Version="0.9.5-beta" /> <PackageReference Include="vke" Version="0.2.0-beta" /> <PackageReference Include="SpirVTasks" Version="0.1.44" /> </ItemGroup> diff --git a/CrowWindow/VkCrowWindow.cs b/CrowWindow/VkCrowWindow.cs index a7e6f74..2ea66e7 100644 --- a/CrowWindow/VkCrowWindow.cs +++ b/CrowWindow/VkCrowWindow.cs @@ -197,8 +197,9 @@ namespace vke { DescriptorSetWrites dsw = new DescriptorSetWrites (descSet, dslBinding); dsw.Write (dev, crowImage.Descriptor); - iFace.surf = new Crow.Cairo.ImageSurface (crowBuffer.MappedData, Crow.Cairo.Format.ARGB32, - (int)Width, (int)Height, (int)Width * 4); + iFace.surf = iFace.CreateSurfaceForData (crowBuffer.MappedData, (int)Width, (int)Height); + /*iFace.surf = new Crow.Cairo.ImageSurface (crowBuffer.MappedData, Crow.Cairo.Format.ARGB32, + (int)Width, (int)Height, (int)Width * 4);*/ PrimaryCommandBuffer cmd = cmdPoolCrow.AllocateAndStart (VkCommandBufferUsageFlags.OneTimeSubmit); crowImage.SetLayout (cmd, VkImageAspectFlags.Color, VkImageLayout.Preinitialized, VkImageLayout.ShaderReadOnlyOptimal); diff --git a/FUNDING.yml b/FUNDING.yml new file mode 100644 index 0000000..253a06e --- /dev/null +++ b/FUNDING.yml @@ -0,0 +1 @@ +custom: "https://www.paypal.me/GrandTetraSoftware" diff --git a/src/BoardWidget.cs b/src/BoardWidget.cs index 3b7385f..c119791 100644 --- a/src/BoardWidget.cs +++ b/src/BoardWidget.cs @@ -21,7 +21,7 @@ using System; using System.ComponentModel; using Crow; -using Crow.Cairo; +using Crow.Drawing; //using vkvg; namespace vkChess diff --git a/ui/promote.crow b/ui/promote.crow index 5071303..3df0b48 100644 --- a/ui/promote.crow +++ b/ui/promote.crow @@ -1,8 +1,8 @@ -<?xml version="1.0" encoding="UTF-8" ?> +<?xml version="1.0" encoding="UTF-8" ?> <Container> <Border Fit="True" - BorderWidth="1" CornerRadius="5" Background="0.4,0.4,0.4,0.8"> - <VerticalStack Fit="True" Margin="30"> + BorderWidth="1" CornerRadius="25" Background="0.4,0.4,0.4,0.8"> + <VerticalStack Fit="True" Margin="20"> <Button Caption="Queen" MouseClick="onPromoteToQueenClick"/> <Button Caption="Bishop" MouseClick="onPromoteToBishopClick"/> <Button Caption="Rook" MouseClick="onPromoteToRookClick"/> diff --git a/vkChess.net.csproj b/vkChess.net.csproj index f2bd7eb..334830e 100644 --- a/vkChess.net.csproj +++ b/vkChess.net.csproj @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <OutputType>Exe</OutputType> + <OutputType>WinExe</OutputType> <TargetFrameworks>netcoreapp3.1</TargetFrameworks> + <TargetFramework>netcoreapp3.1</TargetFramework> <EnableDefaultNoneItems>false</EnableDefaultNoneItems> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> <OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath> |