From 8b6b4f33afd0c447d2e0696c5a414a55c9a2bbde Mon Sep 17 00:00:00 2001
From: Clemens <fischer.clemens@gmail.com>
Date: Sat, 6 Aug 2022 15:06:10 +0200
Subject: [PATCH] Update layout

---
 SampleApps/UniversalApp/MainPage.xaml     | 13 +++++++------
 SampleApps/WinUiApp/MainWindow.xaml       | 13 +++++++------
 SampleApps/WpfApplication/MainWindow.xaml | 17 +++++++++--------
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/SampleApps/UniversalApp/MainPage.xaml b/SampleApps/UniversalApp/MainPage.xaml
index 74c12496..9ffba1fc 100644
--- a/SampleApps/UniversalApp/MainPage.xaml
+++ b/SampleApps/UniversalApp/MainPage.xaml
@@ -111,9 +111,15 @@
             </map:Pushpin>
         </map:Map>
 
+        <Border HorizontalAlignment="Center" VerticalAlignment="Top" Margin="4"
+                Background="#AFFFFFFF" IsHitTestVisible="False">
+            <TextBlock x:Name="mouseLocation" FontFamily="Consolas" Margin="4,2" Visibility="Collapsed"/>
+        </Border>
+
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Bottom" Background="#AFFFFFFF"
                     DataContext="{Binding MapLayer, ElementName=map}">
-            <ProgressBar Width="100" Height="8" Margin="4,2" VerticalAlignment="Center" Maximum="1" Value="{Binding LoadingProgress}">
+            <ProgressBar Width="100" Height="8" Margin="4,2" VerticalAlignment="Center"
+                         Maximum="1" Value="{Binding LoadingProgress}">
                 <ProgressBar.IsIndeterminate>
                     <Binding Path="Value" RelativeSource="{RelativeSource Self}">
                         <Binding.Converter>
@@ -133,11 +139,6 @@
             <TextBlock Margin="4,2" FontSize="10" local:HyperlinkText.InlinesSource="{Binding Description}"/>
         </StackPanel>
 
-        <Border HorizontalAlignment="Center" VerticalAlignment="Top" Margin="4"
-                Background="#AFFFFFFF" IsHitTestVisible="False">
-            <TextBlock x:Name="mouseLocation" FontFamily="Consolas" Margin="4,2" Visibility="Collapsed"/>
-        </Border>
-
         <StackPanel HorizontalAlignment="Left" VerticalAlignment="Top" Margin="6" Background="#7FFFFFFF">
             <tools:MapLayersMenuButton x:Name="mapLayersMenuButton"
                 Margin="2" Padding="8" ToolTipService.ToolTip="Map Layers and Overlays"
diff --git a/SampleApps/WinUiApp/MainWindow.xaml b/SampleApps/WinUiApp/MainWindow.xaml
index 6c71ce85..b7a963bb 100644
--- a/SampleApps/WinUiApp/MainWindow.xaml
+++ b/SampleApps/WinUiApp/MainWindow.xaml
@@ -111,9 +111,15 @@
             </map:Pushpin>
         </map:Map>
 
+        <Border HorizontalAlignment="Center" VerticalAlignment="Top" Margin="4"
+                Background="#AFFFFFFF" IsHitTestVisible="False">
+            <TextBlock x:Name="mouseLocation" FontFamily="Consolas" Margin="4,2" Visibility="Collapsed"/>
+        </Border>
+
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Bottom" Background="#AFFFFFFF"
                     DataContext="{Binding MapLayer, ElementName=map}">
-            <ProgressBar Width="100" Height="8" Margin="4,2" VerticalAlignment="Center" Maximum="1" Value="{Binding LoadingProgress}">
+            <ProgressBar Width="100" Height="8" Margin="4,2" VerticalAlignment="Center"
+                         Maximum="1" Value="{Binding LoadingProgress}">
                 <ProgressBar.IsIndeterminate>
                     <Binding Path="Value" RelativeSource="{RelativeSource Self}">
                         <Binding.Converter>
@@ -133,11 +139,6 @@
             <TextBlock Margin="4,2" FontSize="10" local:HyperlinkText.InlinesSource="{Binding Description}"/>
         </StackPanel>
 
-        <Border HorizontalAlignment="Center" VerticalAlignment="Top" Margin="4"
-                Background="#AFFFFFFF" IsHitTestVisible="False">
-            <TextBlock x:Name="mouseLocation" FontFamily="Consolas" Margin="4,2" Visibility="Collapsed"/>
-        </Border>
-
         <StackPanel HorizontalAlignment="Left" VerticalAlignment="Top" Margin="6">
             <tools:MapLayersMenuButton x:Name="mapLayersMenuButton"
                 Margin="2" Padding="8" ToolTipService.ToolTip="Map Layers and Overlays"
diff --git a/SampleApps/WpfApplication/MainWindow.xaml b/SampleApps/WpfApplication/MainWindow.xaml
index caa35883..671bacdc 100644
--- a/SampleApps/WpfApplication/MainWindow.xaml
+++ b/SampleApps/WpfApplication/MainWindow.xaml
@@ -138,9 +138,17 @@
             <map:Pushpin AutoCollapse="True" Location="53.5,8.2" Content="N 53°30' E 8°12'"/>
         </map:Map>
 
+        <local:OutlinedText
+            x:Name="mouseLocation" Margin="4" FontFamily="Consolas"
+            Background="{Binding Background, ElementName=map}"
+            Foreground="{Binding Foreground, ElementName=map}"
+            HorizontalAlignment="Center" VerticalAlignment="Top"
+            IsHitTestVisible="False"/>
+
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Bottom" Background="#AFFFFFFF"
                     DataContext="{Binding MapLayer, ElementName=map}">
-            <ProgressBar Width="100" Height="8" Margin="4,2" VerticalAlignment="Center" Maximum="1" Value="{Binding LoadingProgress}">
+            <ProgressBar Width="100" Height="8" Margin="4,2" VerticalAlignment="Center"
+                         Maximum="1" Value="{Binding LoadingProgress}">
                 <ProgressBar.Style>
                     <Style TargetType="ProgressBar">
                         <Style.Triggers>
@@ -158,13 +166,6 @@
             <TextBlock Margin="4,2" FontSize="10" local:HyperlinkText.InlinesSource="{Binding Description}"/>
         </StackPanel>
 
-        <local:OutlinedText
-            x:Name="mouseLocation" Margin="4" FontFamily="Consolas"
-            Background="{Binding Background, ElementName=map}"
-            Foreground="{Binding Foreground, ElementName=map}"
-            HorizontalAlignment="Center" VerticalAlignment="Top"
-            IsHitTestVisible="False"/>
-
         <StackPanel HorizontalAlignment="Left" VerticalAlignment="Top" Margin="6">
             <tools:MapLayersMenuButton x:Name="mapLayersMenuButton"
                 Margin="2" ToolTip="Map Layers and Overlays"