From 575930dce826a2474c5a58be16110591b2c337de Mon Sep 17 00:00:00 2001 From: ClemensF Date: Tue, 21 Apr 2015 19:17:32 +0200 Subject: [PATCH] Version 2.4.11: Fixed MapPolyline.Locations property on Windows Phone. Removed Panel.ZIndex handling from MapItemsControl.WPF. --- .../Properties/AssemblyInfo.cs | 4 +-- .../Properties/AssemblyInfo.cs | 4 +-- .../Properties/AssemblyInfo.cs | 4 +-- .../Properties/AssemblyInfo.cs | 4 +-- MapControl/Location.cs | 1 + MapControl/MapItemsControl.WPF.cs | 30 ------------------- MapControl/MapPanel.cs | 6 ++-- MapControl/MapPolyline.cs | 9 +++++- MapControl/Properties/AssemblyInfo.cs | 4 +-- MapControl/WinRT/Properties/AssemblyInfo.cs | 4 +-- .../Properties/AssemblyInfo.cs | 4 +-- .../Properties/AssemblyInfo.cs | 4 +-- .../Properties/AssemblyInfo.cs | 4 +-- .../Properties/AssemblyInfo.cs | 4 +-- SampleApps/WpfApplication/MainWindow.xaml | 15 +++++++--- .../WpfApplication/Properties/AssemblyInfo.cs | 4 +-- 16 files changed, 45 insertions(+), 60 deletions(-) diff --git a/Caching/FileDbCache.WPF/Properties/AssemblyInfo.cs b/Caching/FileDbCache.WPF/Properties/AssemblyInfo.cs index 3eb3f7c4..e6381911 100644 --- a/Caching/FileDbCache.WPF/Properties/AssemblyInfo.cs +++ b/Caching/FileDbCache.WPF/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("2.4.10")] -[assembly: AssemblyFileVersion("2.4.10")] +[assembly: AssemblyVersion("2.4.11")] +[assembly: AssemblyFileVersion("2.4.11")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/Caching/FileDbCache.WinRT/Properties/AssemblyInfo.cs b/Caching/FileDbCache.WinRT/Properties/AssemblyInfo.cs index f8da5bdb..c61c605c 100644 --- a/Caching/FileDbCache.WinRT/Properties/AssemblyInfo.cs +++ b/Caching/FileDbCache.WinRT/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("2.4.10")] -[assembly: AssemblyFileVersion("2.4.10")] +[assembly: AssemblyVersion("2.4.11")] +[assembly: AssemblyFileVersion("2.4.11")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/Caching/ImageFileCache.WPF/Properties/AssemblyInfo.cs b/Caching/ImageFileCache.WPF/Properties/AssemblyInfo.cs index fb3f2dfc..f2c6d1cf 100644 --- a/Caching/ImageFileCache.WPF/Properties/AssemblyInfo.cs +++ b/Caching/ImageFileCache.WPF/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("2.4.10")] -[assembly: AssemblyFileVersion("2.4.10")] +[assembly: AssemblyVersion("2.4.11")] +[assembly: AssemblyFileVersion("2.4.11")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/Caching/ImageFileCache.WinRT/Properties/AssemblyInfo.cs b/Caching/ImageFileCache.WinRT/Properties/AssemblyInfo.cs index f089930b..90d66247 100644 --- a/Caching/ImageFileCache.WinRT/Properties/AssemblyInfo.cs +++ b/Caching/ImageFileCache.WinRT/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("2.4.10")] -[assembly: AssemblyFileVersion("2.4.10")] +[assembly: AssemblyVersion("2.4.11")] +[assembly: AssemblyFileVersion("2.4.11")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MapControl/Location.cs b/MapControl/Location.cs index 6e6cd7bc..36ac7fdd 100644 --- a/MapControl/Location.cs +++ b/MapControl/Location.cs @@ -62,6 +62,7 @@ namespace MapControl public static Location Parse(string s) { var pair = s.Split(new char[] { ',' }); + if (pair.Length != 2) { throw new FormatException("Location string must be a comma-separated pair of double values"); diff --git a/MapControl/MapItemsControl.WPF.cs b/MapControl/MapItemsControl.WPF.cs index d3e5380e..889d9370 100644 --- a/MapControl/MapItemsControl.WPF.cs +++ b/MapControl/MapItemsControl.WPF.cs @@ -2,8 +2,6 @@ // © 2015 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) -using System; -using System.ComponentModel; using System.Windows; using System.Windows.Controls; @@ -20,12 +18,6 @@ namespace MapControl typeof(MapItemsControl), new FrameworkPropertyMetadata(typeof(MapItemsControl))); } - public MapItemsControl() - { - Items.CurrentChanging += CurrentItemChanging; - Items.CurrentChanged += CurrentItemChanged; - } - protected override DependencyObject GetContainerForItemOverride() { return new MapItem(); @@ -35,27 +27,5 @@ namespace MapControl { return item is MapItem; } - - private void CurrentItemChanging(object sender, CurrentChangingEventArgs e) - { - var container = ItemContainerGenerator.ContainerFromItem(Items.CurrentItem) as UIElement; - - if (container != null) - { - var zIndex = Panel.GetZIndex(container); - Panel.SetZIndex(container, zIndex & ~0x40000000); - } - } - - private void CurrentItemChanged(object sender, EventArgs e) - { - var container = ItemContainerGenerator.ContainerFromItem(Items.CurrentItem) as UIElement; - - if (container != null) - { - var zIndex = Panel.GetZIndex(container); - Panel.SetZIndex(container, zIndex | 0x40000000); - } - } } } diff --git a/MapControl/MapPanel.cs b/MapControl/MapPanel.cs index a416115b..dff6c5e1 100644 --- a/MapControl/MapPanel.cs +++ b/MapControl/MapPanel.cs @@ -15,9 +15,9 @@ using System.Windows.Media; namespace MapControl { /// - /// Positions child elements on a Map, at a position specified by the attached property Location. - /// The Location is transformed to a viewport position by ParentMap.MapTransform and ParentMap.ViewportTransform - /// and applied to a child element's RenderTransform as an appropriate TranslateTransform. + /// Arranges child elements on a Map at positions specified by the attached property Location, + /// which is transformed to a viewport position by ParentMap.MapTransform and ParentMap.ViewportTransform + /// and assigned to the child element's RenderTransform as a TranslateTransform. /// public partial class MapPanel : PanelBase, IMapElement { diff --git a/MapControl/MapPolyline.cs b/MapControl/MapPolyline.cs index 9d3e7745..75170ae5 100644 --- a/MapControl/MapPolyline.cs +++ b/MapControl/MapPolyline.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Collections.Specialized; #if WINDOWS_RUNTIME +using System.Collections; using Windows.UI.Xaml; using Windows.UI.Xaml.Media; #else @@ -20,10 +21,16 @@ namespace MapControl /// public partial class MapPolyline : MapPath { +#if WINDOWS_RUNTIME + // Binding fails on Windows Phone when property type is IEnumerable + public static readonly DependencyProperty LocationsProperty = DependencyProperty.Register( + "Locations", typeof(IEnumerable), typeof(MapPolyline), + new PropertyMetadata(null, LocationsPropertyChanged)); +#else public static readonly DependencyProperty LocationsProperty = DependencyProperty.Register( "Locations", typeof(IEnumerable), typeof(MapPolyline), new PropertyMetadata(null, LocationsPropertyChanged)); - +#endif public static readonly DependencyProperty IsClosedProperty = DependencyProperty.Register( "IsClosed", typeof(bool), typeof(MapPolyline), new PropertyMetadata(false, (o, e) => ((MapPolyline)o).UpdateData())); diff --git a/MapControl/Properties/AssemblyInfo.cs b/MapControl/Properties/AssemblyInfo.cs index c7fb5a86..78efad36 100644 --- a/MapControl/Properties/AssemblyInfo.cs +++ b/MapControl/Properties/AssemblyInfo.cs @@ -17,8 +17,8 @@ using System.Windows; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("2.4.10")] -[assembly: AssemblyFileVersion("2.4.10")] +[assembly: AssemblyVersion("2.4.11")] +[assembly: AssemblyFileVersion("2.4.11")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MapControl/WinRT/Properties/AssemblyInfo.cs b/MapControl/WinRT/Properties/AssemblyInfo.cs index 705edef6..e5a0f512 100644 --- a/MapControl/WinRT/Properties/AssemblyInfo.cs +++ b/MapControl/WinRT/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("2.4.10")] -[assembly: AssemblyFileVersion("2.4.10")] +[assembly: AssemblyVersion("2.4.11")] +[assembly: AssemblyFileVersion("2.4.11")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/SampleApps/PhoneApplication/Properties/AssemblyInfo.cs b/SampleApps/PhoneApplication/Properties/AssemblyInfo.cs index 6930fe47..84c3853e 100644 --- a/SampleApps/PhoneApplication/Properties/AssemblyInfo.cs +++ b/SampleApps/PhoneApplication/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("2.4.10")] -[assembly: AssemblyFileVersion("2.4.10")] +[assembly: AssemblyVersion("2.4.11")] +[assembly: AssemblyFileVersion("2.4.11")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs b/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs index ed095a7b..63a1bacc 100644 --- a/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs +++ b/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("2.4.10")] -[assembly: AssemblyFileVersion("2.4.10")] +[assembly: AssemblyVersion("2.4.11")] +[assembly: AssemblyFileVersion("2.4.11")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs b/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs index a248b475..9a172ea1 100644 --- a/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs +++ b/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("2.4.10")] -[assembly: AssemblyFileVersion("2.4.10")] +[assembly: AssemblyVersion("2.4.11")] +[assembly: AssemblyFileVersion("2.4.11")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/SampleApps/StoreApplication/Properties/AssemblyInfo.cs b/SampleApps/StoreApplication/Properties/AssemblyInfo.cs index 8c0ae429..e33d4a4f 100644 --- a/SampleApps/StoreApplication/Properties/AssemblyInfo.cs +++ b/SampleApps/StoreApplication/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("2.4.10")] -[assembly: AssemblyFileVersion("2.4.10")] +[assembly: AssemblyVersion("2.4.11")] +[assembly: AssemblyFileVersion("2.4.11")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/SampleApps/WpfApplication/MainWindow.xaml b/SampleApps/WpfApplication/MainWindow.xaml index 4c5762de..ef519122 100644 --- a/SampleApps/WpfApplication/MainWindow.xaml +++ b/SampleApps/WpfApplication/MainWindow.xaml @@ -94,6 +94,7 @@