diff --git a/Caching/FileDbCache/Properties/AssemblyInfo.cs b/Caching/FileDbCache/Properties/AssemblyInfo.cs
index 4035b9af..fff8b07d 100644
--- a/Caching/FileDbCache/Properties/AssemblyInfo.cs
+++ b/Caching/FileDbCache/Properties/AssemblyInfo.cs
@@ -9,6 +9,6 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("1.2.1")]
-[assembly: AssemblyFileVersion("1.2.1")]
+[assembly: AssemblyVersion("1.2.2")]
+[assembly: AssemblyFileVersion("1.2.2")]
[assembly: ComVisible(false)]
diff --git a/Caching/ImageFileCache/Properties/AssemblyInfo.cs b/Caching/ImageFileCache/Properties/AssemblyInfo.cs
index fe26bc0d..2f880cbe 100644
--- a/Caching/ImageFileCache/Properties/AssemblyInfo.cs
+++ b/Caching/ImageFileCache/Properties/AssemblyInfo.cs
@@ -9,6 +9,6 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("1.2.1")]
-[assembly: AssemblyFileVersion("1.2.1")]
+[assembly: AssemblyVersion("1.2.2")]
+[assembly: AssemblyFileVersion("1.2.2")]
[assembly: ComVisible(false)]
diff --git a/MapControl/MapBase.Silverlight.WinRT.cs b/MapControl/MapBase.Silverlight.WinRT.cs
index 800874af..204327b5 100644
--- a/MapControl/MapBase.Silverlight.WinRT.cs
+++ b/MapControl/MapBase.Silverlight.WinRT.cs
@@ -4,6 +4,7 @@
#if NETFX_CORE
using Windows.Foundation;
+using Windows.UI;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Media.Animation;
diff --git a/MapControl/MapBase.cs b/MapControl/MapBase.cs
index c611b698..73464796 100644
--- a/MapControl/MapBase.cs
+++ b/MapControl/MapBase.cs
@@ -7,7 +7,6 @@ using System.Collections.Specialized;
using System.Linq;
#if NETFX_CORE
using Windows.Foundation;
-using Windows.UI;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Media.Animation;
@@ -31,18 +30,6 @@ namespace MapControl
public static TimeSpan AnimationDuration = TimeSpan.FromSeconds(0.5);
public static EasingFunctionBase AnimationEasingFunction = new QuadraticEase { EasingMode = EasingMode.EaseOut };
- public static readonly DependencyProperty LightForegroundProperty = DependencyProperty.Register(
- "LightForeground", typeof(Brush), typeof(MapBase), null);
-
- public static readonly DependencyProperty DarkForegroundProperty = DependencyProperty.Register(
- "DarkForeground", typeof(Brush), typeof(MapBase), null);
-
- public static readonly DependencyProperty LightBackgroundProperty = DependencyProperty.Register(
- "LightBackground", typeof(Brush), typeof(MapBase), new PropertyMetadata(new SolidColorBrush(Colors.Transparent), null));
-
- public static readonly DependencyProperty DarkBackgroundProperty = DependencyProperty.Register(
- "DarkBackground", typeof(Brush), typeof(MapBase), new PropertyMetadata(new SolidColorBrush(Colors.Transparent), null));
-
public static readonly DependencyProperty TileLayersProperty = DependencyProperty.Register(
"TileLayers", typeof(TileLayerCollection), typeof(MapBase), new PropertyMetadata(null,
(o, e) => ((MapBase)o).TileLayersPropertyChanged((TileLayerCollection)e.OldValue, (TileLayerCollection)e.NewValue)));
@@ -104,13 +91,14 @@ namespace MapControl
private PointAnimation centerAnimation;
private DoubleAnimation zoomLevelAnimation;
private DoubleAnimation headingAnimation;
+ private Brush previousBackground;
+ private Brush previousForeground;
private bool internalPropertyChange;
public MapBase()
{
SetParentMap();
- Background = LightBackground;
TileLayers = new TileLayerCollection();
Initialize();
@@ -133,46 +121,6 @@ namespace MapControl
set { SetValue(ForegroundProperty, value); }
}
- ///
- /// Gets or sets a Brush that (when not null) is used as value of the
- /// Foreground property when TileLayer.HasDarkBackground is false.
- ///
- public Brush LightForeground
- {
- get { return (Brush)GetValue(LightForegroundProperty); }
- set { SetValue(LightForegroundProperty, value); }
- }
-
- ///
- /// Gets or sets a Brush that (when not null) is used as value of the
- /// Foreground property when TileLayer.HasDarkBackground is true.
- ///
- public Brush DarkForeground
- {
- get { return (Brush)GetValue(DarkForegroundProperty); }
- set { SetValue(DarkForegroundProperty, value); }
- }
-
- ///
- /// Gets or sets a Brush that (when not null) is used as value of the
- /// Background property when TileLayer.HasDarkBackground is false.
- ///
- public Brush LightBackground
- {
- get { return (Brush)GetValue(LightBackgroundProperty); }
- set { SetValue(LightBackgroundProperty, value); }
- }
-
- ///
- /// Gets or sets a Brush that (when not null) is used as value of the
- /// Background property when TileLayer.HasDarkBackground is true.
- ///
- public Brush DarkBackground
- {
- get { return (Brush)GetValue(DarkBackgroundProperty); }
- set { SetValue(DarkBackgroundProperty, value); }
- }
-
///
/// Gets or sets the TileLayers used by this Map.
///
@@ -536,29 +484,34 @@ namespace MapControl
}
}
- if (tileLayer != null && tileLayer.HasDarkBackground)
+ if (tileLayer != null && tileLayer.Background != null)
{
- if (DarkForeground != null)
+ if (previousBackground == null)
{
- Foreground = DarkForeground;
+ previousBackground = Background;
}
- if (DarkBackground != null)
- {
- Background = DarkBackground;
- }
+ Background = tileLayer.Background;
}
- else
+ else if (previousBackground != null)
{
- if (LightForeground != null)
+ Background = previousBackground;
+ previousBackground = null;
+ }
+
+ if (tileLayer != null && tileLayer.Foreground != null)
+ {
+ if (previousForeground == null)
{
- Foreground = LightForeground;
+ previousForeground = Foreground;
}
- if (LightBackground != null)
- {
- Background = LightBackground;
- }
+ Foreground = tileLayer.Foreground;
+ }
+ else if (previousForeground != null)
+ {
+ Foreground = previousForeground;
+ previousForeground = null;
}
}
diff --git a/MapControl/MapControl.Silverlight.csproj b/MapControl/MapControl.Silverlight.csproj
index 5b5a657f..ddee10b1 100644
--- a/MapControl/MapControl.Silverlight.csproj
+++ b/MapControl/MapControl.Silverlight.csproj
@@ -76,6 +76,7 @@
+
diff --git a/MapControl/MapControl.WPF.csproj b/MapControl/MapControl.WPF.csproj
index 2aefa025..ecde4b8b 100644
--- a/MapControl/MapControl.WPF.csproj
+++ b/MapControl/MapControl.WPF.csproj
@@ -56,6 +56,7 @@
Code
+
diff --git a/MapControl/MapImage.Silverlight.WinRT.cs b/MapControl/MapImage.Silverlight.WinRT.cs
new file mode 100644
index 00000000..a069f837
--- /dev/null
+++ b/MapControl/MapImage.Silverlight.WinRT.cs
@@ -0,0 +1,49 @@
+// XAML Map Control - http://xamlmapcontrol.codeplex.com/
+// Copyright © 2013 Clemens Fischer
+// Licensed under the Microsoft Public License (Ms-PL)
+
+#if NETFX_CORE
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Media.Imaging;
+#else
+using System.Windows;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+#endif
+
+namespace MapControl
+{
+ public partial class MapImage
+ {
+ private void BeginOpacityAnimation(ImageSource image)
+ {
+ var bitmapImage = image as BitmapImage;
+
+ if (bitmapImage != null)
+ {
+ bitmapImage.ImageOpened += BitmapImageOpened;
+ bitmapImage.ImageFailed += BitmapImageFailed;
+ }
+ else
+ {
+ BeginOpacityAnimation();
+ }
+ }
+
+ private void BitmapImageOpened(object sender, RoutedEventArgs e)
+ {
+ ((BitmapImage)sender).ImageOpened -= BitmapImageOpened;
+ ((BitmapImage)sender).ImageFailed -= BitmapImageFailed;
+ BeginOpacityAnimation();
+ }
+
+ private void BitmapImageFailed(object sender, ExceptionRoutedEventArgs e)
+ {
+ ((BitmapImage)sender).ImageOpened -= BitmapImageOpened;
+ ((BitmapImage)sender).ImageFailed -= BitmapImageFailed;
+ ((ImageBrush)Fill).ImageSource = null;
+ }
+ }
+}
diff --git a/MapControl/MapImage.WPF.cs b/MapControl/MapImage.WPF.cs
new file mode 100644
index 00000000..d6dd7fe4
--- /dev/null
+++ b/MapControl/MapImage.WPF.cs
@@ -0,0 +1,42 @@
+// XAML Map Control - http://xamlmapcontrol.codeplex.com/
+// Copyright © 2013 Clemens Fischer
+// Licensed under the Microsoft Public License (Ms-PL)
+
+using System;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+
+namespace MapControl
+{
+ public partial class MapImage
+ {
+ private void BeginOpacityAnimation(ImageSource image)
+ {
+ var bitmapImage = image as BitmapImage;
+
+ if (bitmapImage != null && bitmapImage.IsDownloading)
+ {
+ bitmapImage.DownloadCompleted += BitmapDownloadCompleted;
+ bitmapImage.DownloadFailed += BitmapDownloadFailed;
+ }
+ else
+ {
+ BeginOpacityAnimation();
+ }
+ }
+
+ private void BitmapDownloadCompleted(object sender, EventArgs e)
+ {
+ ((BitmapImage)sender).DownloadCompleted -= BitmapDownloadCompleted;
+ ((BitmapImage)sender).DownloadFailed -= BitmapDownloadFailed;
+ BeginOpacityAnimation();
+ }
+
+ private void BitmapDownloadFailed(object sender, ExceptionEventArgs e)
+ {
+ ((BitmapImage)sender).DownloadCompleted -= BitmapDownloadCompleted;
+ ((BitmapImage)sender).DownloadFailed -= BitmapDownloadFailed;
+ ((ImageBrush)Fill).ImageSource = null;
+ }
+ }
+}
diff --git a/MapControl/MapImage.cs b/MapControl/MapImage.cs
index f8a4792d..2fc47d2d 100644
--- a/MapControl/MapImage.cs
+++ b/MapControl/MapImage.cs
@@ -5,14 +5,16 @@
#if NETFX_CORE
using Windows.UI.Xaml;
using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Media.Animation;
#else
using System.Windows;
using System.Windows.Media;
+using System.Windows.Media.Animation;
#endif
namespace MapControl
{
- public class MapImage : MapRectangle
+ public partial class MapImage : MapRectangle
{
private static readonly Transform imageTransform = new MatrixTransform
{
@@ -29,13 +31,36 @@ namespace MapControl
set { SetValue(SourceProperty, value); }
}
- private void SourceChanged(ImageSource source)
+ public bool AnimateOpacity { get; set; }
+
+ private void SourceChanged(ImageSource image)
{
Fill = new ImageBrush
{
- ImageSource = source,
- RelativeTransform = imageTransform
+ ImageSource = image,
+ RelativeTransform = imageTransform,
+ Opacity = 0d
};
+
+ if (AnimateOpacity)
+ {
+ BeginOpacityAnimation(image);
+ }
+ else
+ {
+ Fill.Opacity = 1d;
+ }
+ }
+
+ private void BeginOpacityAnimation()
+ {
+ Fill.BeginAnimation(Brush.OpacityProperty,
+ new DoubleAnimation
+ {
+ To = 1d,
+ Duration = Tile.AnimationDuration,
+ FillBehavior = FillBehavior.HoldEnd
+ });
}
}
}
diff --git a/MapControl/Properties/AssemblyInfo.cs b/MapControl/Properties/AssemblyInfo.cs
index 21732114..2fc12f4d 100644
--- a/MapControl/Properties/AssemblyInfo.cs
+++ b/MapControl/Properties/AssemblyInfo.cs
@@ -16,6 +16,6 @@ using System.Windows;
[assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("1.2.1")]
-[assembly: AssemblyFileVersion("1.2.1")]
+[assembly: AssemblyVersion("1.2.2")]
+[assembly: AssemblyFileVersion("1.2.2")]
[assembly: ComVisible(false)]
diff --git a/MapControl/Tile.Silverlight.WinRT.cs b/MapControl/Tile.Silverlight.WinRT.cs
index dbb32006..f9f2060f 100644
--- a/MapControl/Tile.Silverlight.WinRT.cs
+++ b/MapControl/Tile.Silverlight.WinRT.cs
@@ -6,11 +6,13 @@
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Media.Animation;
using Windows.UI.Xaml.Media.Imaging;
#else
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media;
+using System.Windows.Media.Animation;
using System.Windows.Media.Imaging;
#endif
@@ -18,7 +20,7 @@ namespace MapControl
{
public partial class Tile
{
- public readonly Image Image = new Image { IsHitTestVisible = false, Opacity = 0d };
+ public readonly Image Image = new Image { Opacity = 0d };
public ImageSource ImageSource
{
@@ -40,7 +42,7 @@ namespace MapControl
}
else
{
- Image.BeginAnimation(Image.OpacityProperty, OpacityAnimation);
+ BeginOpacityAnimation();
}
}
else
@@ -57,7 +59,7 @@ namespace MapControl
{
((BitmapImage)sender).ImageOpened -= BitmapImageOpened;
((BitmapImage)sender).ImageFailed -= BitmapImageFailed;
- Image.BeginAnimation(Image.OpacityProperty, OpacityAnimation);
+ BeginOpacityAnimation();
}
private void BitmapImageFailed(object sender, ExceptionRoutedEventArgs e)
@@ -66,5 +68,16 @@ namespace MapControl
((BitmapImage)sender).ImageFailed -= BitmapImageFailed;
Image.Source = null;
}
+
+ private void BeginOpacityAnimation()
+ {
+ Image.BeginAnimation(Image.OpacityProperty,
+ new DoubleAnimation
+ {
+ To = 1d,
+ Duration = AnimationDuration,
+ FillBehavior = FillBehavior.HoldEnd
+ });
+ }
}
}
diff --git a/MapControl/Tile.WPF.cs b/MapControl/Tile.WPF.cs
index 6dc9f092..4b1d6cb2 100644
--- a/MapControl/Tile.WPF.cs
+++ b/MapControl/Tile.WPF.cs
@@ -4,6 +4,7 @@
using System;
using System.Windows.Media;
+using System.Windows.Media.Animation;
using System.Windows.Media.Imaging;
using System.Windows.Threading;
@@ -33,7 +34,7 @@ namespace MapControl
}
else
{
- Brush.BeginAnimation(ImageBrush.OpacityProperty, OpacityAnimation);
+ BeginOpacityAnimation();
}
}
else
@@ -50,7 +51,7 @@ namespace MapControl
{
((BitmapImage)sender).DownloadCompleted -= BitmapDownloadCompleted;
((BitmapImage)sender).DownloadFailed -= BitmapDownloadFailed;
- Brush.BeginAnimation(ImageBrush.OpacityProperty, OpacityAnimation);
+ BeginOpacityAnimation();
}
private void BitmapDownloadFailed(object sender, ExceptionEventArgs e)
@@ -59,5 +60,16 @@ namespace MapControl
((BitmapImage)sender).DownloadFailed -= BitmapDownloadFailed;
Brush.ImageSource = null;
}
+
+ private void BeginOpacityAnimation()
+ {
+ Brush.BeginAnimation(ImageBrush.OpacityProperty,
+ new DoubleAnimation
+ {
+ To = 1d,
+ Duration = AnimationDuration,
+ FillBehavior = FillBehavior.HoldEnd
+ });
+ }
}
}
diff --git a/MapControl/Tile.cs b/MapControl/Tile.cs
index ad41929c..ac5dd719 100644
--- a/MapControl/Tile.cs
+++ b/MapControl/Tile.cs
@@ -3,11 +3,6 @@
// Licensed under the Microsoft Public License (Ms-PL)
using System;
-#if NETFX_CORE
-using Windows.UI.Xaml.Media.Animation;
-#else
-using System.Windows.Media.Animation;
-#endif
namespace MapControl
{
@@ -36,18 +31,5 @@ namespace MapControl
return ((X % numTiles) + numTiles) % numTiles;
}
}
-
- public DoubleAnimation OpacityAnimation
- {
- get
- {
- return new DoubleAnimation
- {
- To = 1d,
- Duration = AnimationDuration,
- FillBehavior = FillBehavior.HoldEnd,
- };
- }
- }
}
}
diff --git a/MapControl/TileLayer.cs b/MapControl/TileLayer.cs
index 95fff2dd..26adf885 100644
--- a/MapControl/TileLayer.cs
+++ b/MapControl/TileLayer.cs
@@ -64,7 +64,8 @@ namespace MapControl
public int MaxZoomLevel { get; set; }
public int MaxParallelDownloads { get; set; }
public bool LoadLowerZoomLevels { get; set; }
- public bool HasDarkBackground { get; set; }
+ public Brush Background { get; set; }
+ public Brush Foreground { get; set; }
public string Description
{
@@ -122,9 +123,12 @@ namespace MapControl
{
var tileSize = 1 << (zoomLevel - z);
var x1 = grid.X / tileSize;
+ var y1 = grid.Y / tileSize;
var x2 = (grid.X + grid.Width - 1) / tileSize;
- var y1 = Math.Max(0, grid.Y / tileSize);
- var y2 = Math.Min((1 << z) - 1, (grid.Y + grid.Height - 1) / tileSize);
+ var y2 = (grid.Y + grid.Height - 1) / tileSize;
+
+ y1 = Math.Max(y1, 0);
+ y2 = Math.Min(y2, (1 << z) - 1);
for (var y = y1; y <= y2; y++)
{
diff --git a/MapControl/TileSource.cs b/MapControl/TileSource.cs
index a8080e76..a65beb43 100644
--- a/MapControl/TileSource.cs
+++ b/MapControl/TileSource.cs
@@ -68,6 +68,10 @@ namespace MapControl
{
getUri = GetBoundingBoxUri;
}
+ else if (uriFormat.Contains("{x}") && uriFormat.Contains("{v}") && uriFormat.Contains("{z}"))
+ {
+ getUri = GetTmsUri;
+ }
}
}
@@ -117,6 +121,16 @@ namespace MapControl
Replace("{z}", zoomLevel.ToString()));
}
+ private Uri GetTmsUri(int x, int y, int zoomLevel)
+ {
+ y = (1 << zoomLevel) - 1 - y;
+
+ return new Uri(UriFormat.
+ Replace("{x}", x.ToString()).
+ Replace("{v}", y.ToString()).
+ Replace("{z}", zoomLevel.ToString()));
+ }
+
private Uri GetQuadKeyUri(int x, int y, int zoomLevel)
{
var key = new StringBuilder { Length = zoomLevel };
diff --git a/MapControl/WinRT/MapControl.WinRT.csproj b/MapControl/WinRT/MapControl.WinRT.csproj
index 0b21109f..08618dec 100644
--- a/MapControl/WinRT/MapControl.WinRT.csproj
+++ b/MapControl/WinRT/MapControl.WinRT.csproj
@@ -66,6 +66,9 @@
MapImage.cs
+
+ MapImage.Silverlight.WinRT.cs
+
MapItem.Silverlight.WinRT.cs
diff --git a/MapControl/WinRT/Properties/AssemblyInfo.cs b/MapControl/WinRT/Properties/AssemblyInfo.cs
index bbd3f4d4..25660087 100644
--- a/MapControl/WinRT/Properties/AssemblyInfo.cs
+++ b/MapControl/WinRT/Properties/AssemblyInfo.cs
@@ -9,6 +9,6 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("1.2.1")]
-[assembly: AssemblyFileVersion("1.2.1")]
+[assembly: AssemblyVersion("1.2.2")]
+[assembly: AssemblyFileVersion("1.2.2")]
[assembly: ComVisible(false)]
diff --git a/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs b/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs
index 8302b0c9..7fa1888c 100644
--- a/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs
+++ b/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs
@@ -9,6 +9,6 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("1.2.1")]
-[assembly: AssemblyFileVersion("1.2.1")]
+[assembly: AssemblyVersion("1.2.2")]
+[assembly: AssemblyFileVersion("1.2.2")]
[assembly: ComVisible(false)]
diff --git a/SampleApps/SilverlightApplication/MainPage.xaml b/SampleApps/SilverlightApplication/MainPage.xaml
index 7a00141a..d7db4acd 100644
--- a/SampleApps/SilverlightApplication/MainPage.xaml
+++ b/SampleApps/SilverlightApplication/MainPage.xaml
@@ -106,7 +106,7 @@
+ Source="10_535_330.jpg" Opacity="0.5"/>
@@ -138,7 +138,7 @@
-
+
diff --git a/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs b/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs
index bf41d9db..70d42da1 100644
--- a/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs
+++ b/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs
@@ -9,6 +9,6 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("1.2.1")]
-[assembly: AssemblyFileVersion("1.2.1")]
+[assembly: AssemblyVersion("1.2.2")]
+[assembly: AssemblyFileVersion("1.2.2")]
[assembly: ComVisible(false)]
diff --git a/SampleApps/StoreApplication/MainPage.xaml b/SampleApps/StoreApplication/MainPage.xaml
index adfda434..bec8f38f 100644
--- a/SampleApps/StoreApplication/MainPage.xaml
+++ b/SampleApps/StoreApplication/MainPage.xaml
@@ -108,7 +108,7 @@
+ Source="10_535_330.jpg" Opacity="0.5"/>
diff --git a/SampleApps/StoreApplication/Properties/AssemblyInfo.cs b/SampleApps/StoreApplication/Properties/AssemblyInfo.cs
index f2e8a617..e0e994a3 100644
--- a/SampleApps/StoreApplication/Properties/AssemblyInfo.cs
+++ b/SampleApps/StoreApplication/Properties/AssemblyInfo.cs
@@ -9,6 +9,6 @@ using System.Runtime.InteropServices;
[assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("1.2.1")]
-[assembly: AssemblyFileVersion("1.2.1")]
+[assembly: AssemblyVersion("1.2.2")]
+[assembly: AssemblyFileVersion("1.2.2")]
[assembly: ComVisible(false)]
diff --git a/SampleApps/SurfaceApplication/MainWindow.xaml b/SampleApps/SurfaceApplication/MainWindow.xaml
index 32affe34..2faa7793 100644
--- a/SampleApps/SurfaceApplication/MainWindow.xaml
+++ b/SampleApps/SurfaceApplication/MainWindow.xaml
@@ -6,7 +6,6 @@
Title="SurfaceApplication" WindowStyle="None" WindowState="Maximized">
diff --git a/SampleApps/SurfaceApplication/Properties/AssemblyInfo.cs b/SampleApps/SurfaceApplication/Properties/AssemblyInfo.cs
index a8730698..fa10f8f0 100644
--- a/SampleApps/SurfaceApplication/Properties/AssemblyInfo.cs
+++ b/SampleApps/SurfaceApplication/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@ using System.Windows;
[assembly: AssemblyCopyright("Copyright © 2013 Clemens Fischer")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("1.2.1")]
-[assembly: AssemblyFileVersion("1.2.1")]
+[assembly: AssemblyVersion("1.2.2")]
+[assembly: AssemblyFileVersion("1.2.2")]
[assembly: ComVisible(false)]
[assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
diff --git a/SampleApps/WpfApplication/MainWindow.xaml b/SampleApps/WpfApplication/MainWindow.xaml
index d4e48c6e..6afababd 100644
--- a/SampleApps/WpfApplication/MainWindow.xaml
+++ b/SampleApps/WpfApplication/MainWindow.xaml
@@ -23,14 +23,14 @@
+
+ -->