1
0
Форкнуть 0

Updated project to use the latest Maui and Maui Graphics version

This commit is contained in:
Javier Suárez Ruiz 2021-11-06 11:41:59 +01:00
Родитель 434a492332
Коммит 358c56aac5
7 изменённых файлов: 12 добавлений и 8 удалений

Просмотреть файл

@ -83,8 +83,8 @@
</PropertyGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-windows')) == true ">
<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.0.26-experimental1" />
<PackageReference Include="Microsoft.Maui.Graphics.Win2D.WinUI.Desktop" Version="6.0.101-preview.9.512" />
<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.0.29-preview3" />
<PackageReference Include="Microsoft.Maui.Graphics.Win2D.WinUI.Desktop" Version="6.0.101-preview.10.640" />
</ItemGroup>
</Project>

Просмотреть файл

@ -17,7 +17,7 @@
<ApplicationId>com.companyname.GraphicsControls.Sample</ApplicationId>
<!-- Versions -->
<ApplicationVersion>1.0</ApplicationVersion>
<ApplicationVersion>1</ApplicationVersion>
<AndroidVersionCode>1</AndroidVersionCode>
</PropertyGroup>

Просмотреть файл

@ -12,7 +12,7 @@
<PackageId>Microsoft.Maui.Graphics.Controls</PackageId>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Maui.Graphics" Version="6.0.101-preview.9.512" />
<PackageReference Include="Microsoft.Maui.Graphics" Version="6.0.101-preview.10.640" />
</ItemGroup>
<Import Project="..\..\Microsoft.Maui.Graphics.Controls.MultiTargeting.targets" />
</Project>

Просмотреть файл

@ -4,6 +4,7 @@ using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Controls.Primitives;
using System;
using WSize = Windows.Foundation.Size;
namespace Microsoft.Maui.Graphics.Controls
{
@ -124,7 +125,7 @@ namespace Microsoft.Maui.Graphics.Controls
W2DGraphicsService.ThreadLocalCreator = sender;
_canvas.Session = args.DrawingSession;
_canvas.CanvasSize = new Windows.Foundation.Size(_dirty.Width, _dirty.Height);
_canvas.CanvasSize = new WSize(_dirty.Width, _dirty.Height);
_drawable.Draw(_canvas, _dirty);
W2DGraphicsService.ThreadLocalCreator = null;
}

Просмотреть файл

@ -2,6 +2,7 @@
using Microsoft.Maui.Graphics.Win2D;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using WSize = Windows.Foundation.Size;
namespace Microsoft.Maui.Graphics.Controls
{
@ -75,7 +76,7 @@ namespace Microsoft.Maui.Graphics.Controls
W2DGraphicsService.ThreadLocalCreator = sender;
_canvas.Session = args.DrawingSession;
_canvas.CanvasSize = new Windows.Foundation.Size(_dirty.Width, _dirty.Height);
_canvas.CanvasSize = new WSize(_dirty.Width, _dirty.Height);
_drawable.Draw(_canvas, _dirty);
W2DGraphicsService.ThreadLocalCreator = null;
}

Просмотреть файл

@ -4,6 +4,7 @@ using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using System;
using System.Diagnostics;
using WSize = Windows.Foundation.Size;
namespace Microsoft.Maui.Graphics.Controls
{
@ -78,7 +79,7 @@ namespace Microsoft.Maui.Graphics.Controls
W2DGraphicsService.ThreadLocalCreator = sender;
_canvas.Session = args.DrawingSession;
_canvas.CanvasSize = new Windows.Foundation.Size(_dirty.Width, _dirty.Height);
_canvas.CanvasSize = new WSize(_dirty.Width, _dirty.Height);
_drawable.Draw(_canvas, _dirty);
W2DGraphicsService.ThreadLocalCreator = null;
}

Просмотреть файл

@ -4,6 +4,7 @@ using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Controls.Primitives;
using System;
using WSize = Windows.Foundation.Size;
namespace Microsoft.Maui.Graphics.Controls
{
@ -98,7 +99,7 @@ namespace Microsoft.Maui.Graphics.Controls
W2DGraphicsService.ThreadLocalCreator = sender;
_canvas.Session = args.DrawingSession;
_canvas.CanvasSize = new Windows.Foundation.Size(_dirty.Width, _dirty.Height);
_canvas.CanvasSize = new WSize(_dirty.Width, _dirty.Height);
_drawable.Draw(_canvas, _dirty);
W2DGraphicsService.ThreadLocalCreator = null;
}