ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2026-04-05 14:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed clipping of WinUI/UWP MapPath

Browse source
This commit is contained in:
ClemensFischer 2023-01-21 14:41:03 +01:00
parent fd13503613
commit a282ba1b5e
6 changed files with 101 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

44
MapControl/Shared/MapPanel.cs
View file

@ -264,17 +264,7 @@ namespace MapControl
private static void ArrangeElement(FrameworkElement element, Point position)
{
var rect = new Rect(position.X, position.Y, 0d, 0d);
if (element.DesiredSize.Width >= 0d && element.DesiredSize.Width < double.PositiveInfinity)
{
rect.Width = element.DesiredSize.Width;
}
if (element.DesiredSize.Height >= 0d && element.DesiredSize.Height < double.PositiveInfinity)
{
rect.Height = element.DesiredSize.Height;
}
var rect = new Rect(position, GetDesiredSize(element));
switch (element.HorizontalAlignment)
{
@ -309,17 +299,7 @@ namespace MapControl
private static void ArrangeElement(FrameworkElement element, Size parentSize)
{
var rect = new Rect();
if (element.DesiredSize.Width >= 0d && element.DesiredSize.Width < double.PositiveInfinity)
{
rect.Width = element.DesiredSize.Width;
}
if (element.DesiredSize.Height >= 0d && element.DesiredSize.Height < double.PositiveInfinity)
{
rect.Height = element.DesiredSize.Height;
}
var rect = new Rect(new Point(), GetDesiredSize(element));
switch (element.HorizontalAlignment)
{
@ -391,5 +371,25 @@ namespace MapControl
element.Arrange(rect);
}
internal static Size GetDesiredSize(UIElement element)
{
var width = 0d;
var height = 0d;
if (element.DesiredSize.Width >= 0d &&
element.DesiredSize.Width < double.PositiveInfinity)
{
width = element.DesiredSize.Width;
}
if (element.DesiredSize.Height >= 0d &&
element.DesiredSize.Height < double.PositiveInfinity)
{
height = element.DesiredSize.Height;
}
return new Size(width, height);
}
}
}