Version 1.1.7: Fixed MapPolyline.MeasureOverride.

This commit is contained in:
ClemensF 2013-02-21 20:58:57 +01:00
parent 2a9cd578ab
commit 2b5ef99999
10 changed files with 23 additions and 23 deletions

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.6")] [assembly: AssemblyVersion("1.1.7")]
[assembly: AssemblyFileVersion("1.1.6")] [assembly: AssemblyFileVersion("1.1.7")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

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.6")] [assembly: AssemblyVersion("1.1.7")]
[assembly: AssemblyFileVersion("1.1.6")] [assembly: AssemblyFileVersion("1.1.7")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

View file

@ -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()
{ {

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.6")] [assembly: AssemblyVersion("1.1.7")]
[assembly: AssemblyFileVersion("1.1.6")] [assembly: AssemblyFileVersion("1.1.7")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

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.6")] [assembly: AssemblyVersion("1.1.7")]
[assembly: AssemblyFileVersion("1.1.6")] [assembly: AssemblyFileVersion("1.1.7")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

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.6")] [assembly: AssemblyVersion("1.1.7")]
[assembly: AssemblyFileVersion("1.1.6")] [assembly: AssemblyFileVersion("1.1.7")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

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.6")] [assembly: AssemblyVersion("1.1.7")]
[assembly: AssemblyFileVersion("1.1.6")] [assembly: AssemblyFileVersion("1.1.7")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

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.6")] [assembly: AssemblyVersion("1.1.7")]
[assembly: AssemblyFileVersion("1.1.6")] [assembly: AssemblyFileVersion("1.1.7")]
[assembly: ComVisible(false)] [assembly: ComVisible(false)]

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.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)]

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.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)]