Skip to content
This repository has been archived by the owner on Dec 21, 2023. It is now read-only.

Update UWP + Runtime and compile time fixes #254

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Update UWP + Runtime and compile time fixes #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e1016d
Updated UWP deps
Mohsens22 Dec 29, 2021
55c89a7
Fix compilation problem on WPF
Mohsens22 Dec 29, 2021
db90413
Fixed a crash problem in UWP
Mohsens22 Dec 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion samples/GraphicsTester.WindowsUniversal/GraphicsTester.WindowsUniversal.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.10</Version>
<Version>6.2.13</Version>
</PackageReference>
</ItemGroup>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Maui.Graphics.SharpDX.UWP/Microsoft.Maui.Graphics.SharpDX.UWP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.10</Version>
<Version>6.2.13</Version>
</PackageReference>
<PackageReference Include="SharpDX">
<Version>4.2.0</Version>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Maui.Graphics.Win2D.UWP/Microsoft.Maui.Graphics.Win2D.UWP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.10</Version>
<Version>6.2.13</Version>
</PackageReference>
<PackageReference Include="Win2D.uwp">
<Version>1.25.0</Version>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Maui.Graphics.Xaml.UWP/Microsoft.Maui.Graphics.Xaml.UWP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.10</Version>
<Version>6.2.13</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Maui.Graphics.Xaml.UWP/XamlCanvasState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ public string Font
get
{
var style = Fonts.CurrentService.GetFontStyleById(_font ?? "Arial");
return new global::Windows.UI.Xaml.Media.FontFamily(style.FontFamily.Name);
return new global::Windows.UI.Xaml.Media.FontFamily(style != null ? style.FontFamily.Name : "Arial");
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.Maui.Graphics.Xaml.WPF/XamlCanvas.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,8 +433,8 @@ protected override void NativeDrawLine(float x1, float y1, float x2, float y2)
var item = GetOrCreateItem(ItemType.DrawLine);
var element = (Line) item.Element;

var p1 = CurrentState.Transform.Transform(x1, y1);
var p2 = CurrentState.Transform.Transform(x2, y2);
var p1 = Vector2.Transform(new Vector2(x1, y1), CurrentState.Transform);
var p2 = Vector2.Transform(new Vector2(x2, y2), CurrentState.Transform);
element.X1 = p1.X;
element.Y1 = p1.Y;
element.X2 = p2.X;
Expand Down