From 89c3fc00cc916e5525f5ab8ef22a55372be8a6c8 Mon Sep 17 00:00:00 2001
From: Morten Nielsen <mnielsen@esri.com>
Date: Mon, 7 Aug 2023 12:23:24 -0700
Subject: [PATCH] Use Border instead of Frame to avoid layout issues in MAUI

---
 .../Samples/SymbolDisplaySample.xaml.cs            | 14 +++++++-------
 .../Samples/SymbolEditorSample.xaml                |  6 ++++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/Samples/Toolkit.SampleApp.Maui/Samples/SymbolDisplaySample.xaml.cs b/src/Samples/Toolkit.SampleApp.Maui/Samples/SymbolDisplaySample.xaml.cs
index c6be79e45..1b9411694 100644
--- a/src/Samples/Toolkit.SampleApp.Maui/Samples/SymbolDisplaySample.xaml.cs
+++ b/src/Samples/Toolkit.SampleApp.Maui/Samples/SymbolDisplaySample.xaml.cs
@@ -38,23 +38,23 @@ private void AddSymbol(Symbol symbol)
         {
             int columnCount = LayoutRoot.ColumnDefinitions.Count;
             var sd = new SymbolDisplay() { Symbol = symbol };
-            Frame f = new Frame()
+            Border border = new Border()
             {
                 HorizontalOptions = LayoutOptions.Center,
                 VerticalOptions = LayoutOptions.Center,
                 Padding = 0,
-                CornerRadius = 0
+                StrokeThickness = 1,
             };
-            f.SetAppThemeColor(Microsoft.Maui.Controls.Frame.BorderColorProperty, Colors.Black, Colors.White);
-            f.Content = sd;
+            border.SetAppThemeColor(Microsoft.Maui.Controls.Border.StrokeProperty, Colors.Black, Colors.White);
+            border.Content = sd;
             int count = LayoutRoot.Children.Count;
             var row = count / columnCount;
             var column = count % columnCount;
             if (column == 0)
                 LayoutRoot.RowDefinitions.Add(new RowDefinition());
-            Grid.SetRow(f, row);
-            Grid.SetColumn(f, column);
-            LayoutRoot.Children.Add(f);
+            Grid.SetRow(border, row);
+            Grid.SetColumn(border, column);
+            LayoutRoot.Children.Add(border);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Samples/Toolkit.SampleApp.Maui/Samples/SymbolEditorSample.xaml b/src/Samples/Toolkit.SampleApp.Maui/Samples/SymbolEditorSample.xaml
index fb3d8690b..9338eec7c 100644
--- a/src/Samples/Toolkit.SampleApp.Maui/Samples/SymbolEditorSample.xaml
+++ b/src/Samples/Toolkit.SampleApp.Maui/Samples/SymbolEditorSample.xaml
@@ -22,9 +22,11 @@
 
             </StackLayout>
 
-            <Frame BorderColor="LightGray" Grid.Row="1" Margin="20" HorizontalOptions="Center" VerticalOptions="Center" Padding="0" CornerRadius="0">
+            <Border Stroke="LightGray" Grid.Row="1" Margin="0" HorizontalOptions="Center" VerticalOptions="Center" Padding="0" >
                 <esri:SymbolDisplay x:Name="symbolDisplay" Symbol="{Binding Symbol}" />
-            </Frame>
+
+            </Border>
+            
         </Grid>
     </ContentPage.Content>
 </ContentPage>
\ No newline at end of file