ClemensFischer/XAML-Map-Control
1
0
Fork 0
mirror of https://github.com/ClemensFischer/XAML-Map-Control.git synced 2025-12-06 07:12:04 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update MapPanel.cs

Browse source
This commit is contained in:
ClemensFischer 2024-05-22 15:14:46 +02:00
parent c95df3b81b
commit f8687ad3b7
1 changed files with 49 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
MapControl/Shared/MapPanel.cs
View file

@ -2,6 +2,8 @@
// Copyright © 2024 Clemens Fischer
// Licensed under the Microsoft Public License (Ms-PL)
using System;
using System.Diagnostics;
#if WPF
using System.Windows;
using System.Windows.Controls;
@ -188,37 +190,13 @@ namespace MapControl
{
foreach (var element in ChildElements)
{
var location = GetLocation(element);
var position = location != null ? GetViewPosition(location) : null;
SetViewPosition(element, ref position);
if (GetAutoCollapse(element))
try
{
SetVisible(element, !(position.HasValue && IsOutsideViewport(position.Value)));
ArrangeChildElement(element, finalSize);
}
if (position.HasValue)
catch (Exception ex)
{
ArrangeElement(element, position.Value);
}
else
{
var boundingBox = GetBoundingBox(element);
if (boundingBox != null)
{
var viewRect = GetViewRect(boundingBox);
if (viewRect.HasValue)
{
ArrangeElement(element, viewRect.Value);
}
}
else
{
ArrangeElement(element, finalSize);
}
Debug.WriteLine($"MapPanel.ArrangeOverride: {element}: {ex.Message}");
}
}
}
@ -289,6 +267,42 @@ namespace MapControl
|| point.Y < 0d || point.Y > parentMap.RenderSize.Height;
}
private void ArrangeChildElement(FrameworkElement element, Size panelSize)
{
var location = GetLocation(element);
var position = location != null ? GetViewPosition(location) : null;
SetViewPosition(element, ref position);
if (GetAutoCollapse(element))
{
SetVisible(element, !(position.HasValue && IsOutsideViewport(position.Value)));
}
if (position.HasValue)
{
ArrangeElement(element, position.Value);
}
else
{
var boundingBox = GetBoundingBox(element);
if (boundingBox != null)
{
var viewRect = GetViewRect(boundingBox);
if (viewRect.HasValue)
{
ArrangeElement(element, viewRect.Value);
}
}
else
{
ArrangeElement(element, panelSize);
}
}
}
private static void ArrangeElement(FrameworkElement element, Point position)
{
var size = GetDesiredSize(element);
@ -326,7 +340,7 @@ namespace MapControl
element.Arrange(new Rect(x, y, size.Width, size.Height));
}
private static void ArrangeElement(FrameworkElement element, Size parentSize)
private static void ArrangeElement(FrameworkElement element, Size panelSize)
{
var size = GetDesiredSize(element);
var x = 0d;
@ -337,15 +351,15 @@ namespace MapControl
switch (element.HorizontalAlignment)
{
case HorizontalAlignment.Center:
x = (parentSize.Width - size.Width) / 2d;
x = (panelSize.Width - size.Width) / 2d;
break;
case HorizontalAlignment.Right:
x = parentSize.Width - size.Width;
x = panelSize.Width - size.Width;
break;
case HorizontalAlignment.Stretch:
width = parentSize.Width;
width = panelSize.Width;
break;
default:
@ -355,15 +369,15 @@ namespace MapControl
switch (element.VerticalAlignment)
{
case VerticalAlignment.Center:
y = (parentSize.Height - size.Height) / 2d;
y = (panelSize.Height - size.Height) / 2d;
break;
case VerticalAlignment.Bottom:
y = parentSize.Height - size.Height;
y = panelSize.Height - size.Height;
break;
case VerticalAlignment.Stretch:
height = parentSize.Height;
height = panelSize.Height;
break;
default: