mirror of
https://github.com/ClemensFischer/XAML-Map-Control.git
synced 2025-12-06 07:12:04 +01:00
Version 1.1.7: Fixed MapPolyline.MeasureOverride.
This commit is contained in:
parent
2a9cd578ab
commit
2b5ef99999
|
|
@ -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.6")]
|
[assembly: AssemblyVersion("1.1.7")]
|
||||||
[assembly: AssemblyFileVersion("1.1.6")]
|
[assembly: AssemblyFileVersion("1.1.7")]
|
||||||
[assembly: ComVisible(false)]
|
[assembly: ComVisible(false)]
|
||||||
|
|
|
||||||
|
|
@ -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.6")]
|
[assembly: AssemblyVersion("1.1.7")]
|
||||||
[assembly: AssemblyFileVersion("1.1.6")]
|
[assembly: AssemblyFileVersion("1.1.7")]
|
||||||
[assembly: ComVisible(false)]
|
[assembly: ComVisible(false)]
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@
|
||||||
|
|
||||||
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
|
||||||
|
|
@ -24,14 +25,13 @@ namespace MapControl
|
||||||
MapPanel.AddParentMapHandlers(this);
|
MapPanel.AddParentMapHandlers(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if SILVERLIGHT
|
|
||||||
// In Silverlight Path.MeasureOverride occasionally tries to create
|
|
||||||
// negative width or height from a transformed geometry in Path.Data.
|
|
||||||
protected override Size MeasureOverride(Size constraint)
|
protected override Size MeasureOverride(Size constraint)
|
||||||
{
|
{
|
||||||
return new Size(Geometry.Bounds.Width, Geometry.Bounds.Height);
|
// 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);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
private void UpdateGeometry()
|
private void UpdateGeometry()
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -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.6")]
|
[assembly: AssemblyVersion("1.1.7")]
|
||||||
[assembly: AssemblyFileVersion("1.1.6")]
|
[assembly: AssemblyFileVersion("1.1.7")]
|
||||||
[assembly: ComVisible(false)]
|
[assembly: ComVisible(false)]
|
||||||
|
|
|
||||||
|
|
@ -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.6")]
|
[assembly: AssemblyVersion("1.1.7")]
|
||||||
[assembly: AssemblyFileVersion("1.1.6")]
|
[assembly: AssemblyFileVersion("1.1.7")]
|
||||||
[assembly: ComVisible(false)]
|
[assembly: ComVisible(false)]
|
||||||
|
|
|
||||||
|
|
@ -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.6")]
|
[assembly: AssemblyVersion("1.1.7")]
|
||||||
[assembly: AssemblyFileVersion("1.1.6")]
|
[assembly: AssemblyFileVersion("1.1.7")]
|
||||||
[assembly: ComVisible(false)]
|
[assembly: ComVisible(false)]
|
||||||
|
|
|
||||||
|
|
@ -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.6")]
|
[assembly: AssemblyVersion("1.1.7")]
|
||||||
[assembly: AssemblyFileVersion("1.1.6")]
|
[assembly: AssemblyFileVersion("1.1.7")]
|
||||||
[assembly: ComVisible(false)]
|
[assembly: ComVisible(false)]
|
||||||
|
|
|
||||||
|
|
@ -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.6")]
|
[assembly: AssemblyVersion("1.1.7")]
|
||||||
[assembly: AssemblyFileVersion("1.1.6")]
|
[assembly: AssemblyFileVersion("1.1.7")]
|
||||||
[assembly: ComVisible(false)]
|
[assembly: ComVisible(false)]
|
||||||
|
|
|
||||||
|
|
@ -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.6")]
|
[assembly: AssemblyVersion("1.1.7")]
|
||||||
[assembly: AssemblyFileVersion("1.1.6")]
|
[assembly: AssemblyFileVersion("1.1.7")]
|
||||||
[assembly: ComVisible(false)]
|
[assembly: ComVisible(false)]
|
||||||
[assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
|
[assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
|
||||||
|
|
|
||||||
|
|
@ -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.6")]
|
[assembly: AssemblyVersion("1.1.7")]
|
||||||
[assembly: AssemblyFileVersion("1.1.6")]
|
[assembly: AssemblyFileVersion("1.1.7")]
|
||||||
[assembly: ComVisible(false)]
|
[assembly: ComVisible(false)]
|
||||||
[assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
|
[assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue