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

Version 1.1.8: Fixed MapPolyline.MeasureOverride also for WPF.

Browse source
This commit is contained in:
ClemensF 2013-03-01 16:27:22 +01:00
parent 2b5ef99999
commit b1bfccd321
12 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Caching/FileDbCache/Properties/AssemblyInfo.cs
View file

@ -9,6 +9,6 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: AssemblyVersion("1.1.7")] [assembly: AssemblyVersion("1.1.8")]
[assembly: AssemblyFileVersion("1.1.7")] [assembly: AssemblyFileVersion("1.1.8")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

4
Caching/ImageFileCache/Properties/AssemblyInfo.cs
View file

@ -9,6 +9,6 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: AssemblyVersion("1.1.7")] [assembly: AssemblyVersion("1.1.8")]
[assembly: AssemblyFileVersion("1.1.7")] [assembly: AssemblyFileVersion("1.1.8")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

9
MapControl/MapPolyline.Silverlight.WinRT.cs
View file

@ -4,7 +4,6 @@
using System.Linq; using System.Linq;
#if NETFX_CORE #if NETFX_CORE
using Windows.Foundation;
using Windows.UI.Xaml.Media; using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Shapes; using Windows.UI.Xaml.Shapes;
#else #else
@ -25,14 +24,6 @@ namespace MapControl
MapPanel.AddParentMapHandlers(this); MapPanel.AddParentMapHandlers(this);
} }
protected override Size MeasureOverride(Size constraint)
{
// The Silverlight Path.MeasureOverride occasionally tries to create a Size from
// a negative width or height, apparently resulting from a transformed geometry
// in Path.Data. It seems to be sufficient to always return a non-zero size.
return new Size(1, 1);
}
private void UpdateGeometry() private void UpdateGeometry()
{ {
var parentMap = MapPanel.GetParentMap(this); var parentMap = MapPanel.GetParentMap(this);

2
MapControl/MapPolyline.WPF.cs
View file

@ -2,9 +2,7 @@
// Copyright © 2013 Clemens Fischer // Copyright © 2013 Clemens Fischer
// Licensed under the Microsoft Public License (Ms-PL) // Licensed under the Microsoft Public License (Ms-PL)
using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Windows;
using System.Windows.Media; using System.Windows.Media;
using System.Windows.Shapes; using System.Windows.Shapes;

11
MapControl/MapPolyline.cs
View file

@ -6,6 +6,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.Specialized; using System.Collections.Specialized;
#if NETFX_CORE #if NETFX_CORE
using Windows.Foundation;
using Windows.UI.Xaml; using Windows.UI.Xaml;
#else #else
using System.Windows; using System.Windows;
@ -48,6 +49,16 @@ namespace MapControl
set { SetValue(IsClosedProperty, value); } set { SetValue(IsClosedProperty, value); }
} }
protected override Size MeasureOverride(Size constraint)
{
// Shape.MeasureOverride in WPF and WinRT sometimes return a Size with zero
// width or height, whereas Shape.MeasureOverride in Silverlight occasionally
// throws an ArgumentException, as it tries to create a Size from a negative
// width or height, apparently resulting from a transformed geometry in Path.Data.
// In either case it seems to be sufficient to simply return a non-zero size.
return new Size(1, 1);
}
void IMapElement.ParentMapChanged(MapBase oldParentMap, MapBase newParentMap) void IMapElement.ParentMapChanged(MapBase oldParentMap, MapBase newParentMap)
{ {
UpdateGeometry(); UpdateGeometry();

4
MapControl/Properties/AssemblyInfo.cs
View file

@ -16,6 +16,6 @@ using System.Windows;
[assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: AssemblyVersion("1.1.7")] [assembly: AssemblyVersion("1.1.8")]
[assembly: AssemblyFileVersion("1.1.7")] [assembly: AssemblyFileVersion("1.1.8")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

4
MapControl/WinRT/Properties/AssemblyInfo.cs
View file

@ -9,6 +9,6 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: AssemblyVersion("1.1.7")] [assembly: AssemblyVersion("1.1.8")]
[assembly: AssemblyFileVersion("1.1.7")] [assembly: AssemblyFileVersion("1.1.8")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

4
SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs
View file

@ -9,6 +9,6 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: AssemblyVersion("1.1.7")] [assembly: AssemblyVersion("1.1.8")]
[assembly: AssemblyFileVersion("1.1.7")] [assembly: AssemblyFileVersion("1.1.8")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

4
SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs
View file

@ -9,6 +9,6 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: AssemblyVersion("1.1.7")] [assembly: AssemblyVersion("1.1.8")]
[assembly: AssemblyFileVersion("1.1.7")] [assembly: AssemblyFileVersion("1.1.8")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

4
SampleApps/StoreApplication/Properties/AssemblyInfo.cs
View file

@ -9,6 +9,6 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: AssemblyVersion("1.1.7")] [assembly: AssemblyVersion("1.1.8")]
[assembly: AssemblyFileVersion("1.1.7")] [assembly: AssemblyFileVersion("1.1.8")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

4
SampleApps/SurfaceApplication/Properties/AssemblyInfo.cs
View file

@ -10,7 +10,7 @@ using System.Windows;
[assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: AssemblyVersion("1.1.7")] [assembly: AssemblyVersion("1.1.8")]
[assembly: AssemblyFileVersion("1.1.7")] [assembly: AssemblyFileVersion("1.1.8")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]
[assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)] [assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]

4
SampleApps/WpfApplication/Properties/AssemblyInfo.cs
View file

@ -10,7 +10,7 @@ using System.Windows;
[assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
[assembly: AssemblyVersion("1.1.7")] [assembly: AssemblyVersion("1.1.8")]
[assembly: AssemblyFileVersion("1.1.7")] [assembly: AssemblyFileVersion("1.1.8")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]
[assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)] [assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]