From 78835a54a348817cb83220569512fb15cda76f67 Mon Sep 17 00:00:00 2001
From: Yan Maniez <yanmaniez@hotmail.com>
Date: Mon, 28 Oct 2019 23:12:14 +0100
Subject: [PATCH] =?UTF-8?q?Correctif=20d=C3=A9s=20!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AideDeJeu/AideDeJeu/Views/DicesPage.xaml    |  5 ++++-
 AideDeJeu/AideDeJeu/Views/DicesPage.xaml.cs | 13 +++++++++++--
 AideDeJeu/AideDeJeu/Views/UrhoTest.cs       |  5 +++++
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/AideDeJeu/AideDeJeu/Views/DicesPage.xaml b/AideDeJeu/AideDeJeu/Views/DicesPage.xaml
index 6b57fc18..ac0b4b98 100644
--- a/AideDeJeu/AideDeJeu/Views/DicesPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/DicesPage.xaml
@@ -82,7 +82,10 @@
                 <Button Text="Menu" Clicked="Menu_Clicked"/>
                 <Button Text="Générer" Clicked="Refresh_Clicked"/>
             </StackLayout>
-            <urho:UrhoSurface x:Name="HelloWorldUrhoSurface" VerticalOptions="FillAndExpand" BackgroundColor="White" />
+            <StackLayout x:Name="RootSurface" VerticalOptions="FillAndExpand" BackgroundColor="White" >
+                
+            </StackLayout>
+            <!--<urho:UrhoSurface x:Name="HelloWorldUrhoSurface" VerticalOptions="FillAndExpand" BackgroundColor="White" />-->
         </StackLayout>
     </ContentPage.Content>
 </ContentPage>
\ No newline at end of file
diff --git a/AideDeJeu/AideDeJeu/Views/DicesPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/DicesPage.xaml.cs
index 0c694c8a..9469ecbf 100644
--- a/AideDeJeu/AideDeJeu/Views/DicesPage.xaml.cs
+++ b/AideDeJeu/AideDeJeu/Views/DicesPage.xaml.cs
@@ -91,8 +91,13 @@ namespace AideDeJeu.Views
         {
             try
             {
-                var ao = new Urho.ApplicationOptions(assetsFolder: null);
-                charts = await HelloWorldUrhoSurface.Show<Charts>(ao);
+                //if (charts == null)
+                //{
+                    var ao = new Urho.ApplicationOptions(assetsFolder: null);
+                    var urhoSurface = new Urho.Forms.UrhoSurface() { VerticalOptions = LayoutOptions.FillAndExpand, BackgroundColor = Xamarin.Forms.Color.White };
+                    RootSurface.Children.Add(urhoSurface);
+                    charts = await urhoSurface.Show<Charts>(ao);
+                //}
             }
             catch(Exception ex)
             {
@@ -132,6 +137,10 @@ namespace AideDeJeu.Views
                 }
             }
             catch { }
+            RootSurface.Children.Clear();
+            //charts?.DoStop();
+            ////charts?.Dispose();
+            //charts = null;
         }
 
         private void Menu_Clicked(object sender, EventArgs e)
diff --git a/AideDeJeu/AideDeJeu/Views/UrhoTest.cs b/AideDeJeu/AideDeJeu/Views/UrhoTest.cs
index fa179b00..3bf758ad 100644
--- a/AideDeJeu/AideDeJeu/Views/UrhoTest.cs
+++ b/AideDeJeu/AideDeJeu/Views/UrhoTest.cs
@@ -26,6 +26,11 @@ namespace AideDeJeu.Views
         Viewport vp;
         Renderer renderer;
 
+        public void DoStop()
+        {
+            base.Exit(); //.Stop();
+        }
+
         public Bar SelectedBar { get; private set; }
 
         public IEnumerable<Bar> Bars => bars;