From 1f7ba9b51f18a8ee02d0867bae45277f0d2c5f98 Mon Sep 17 00:00:00 2001
From: Yan Maniez <yan.maniez@atos.net>
Date: Wed, 16 Oct 2019 14:58:42 +0200
Subject: [PATCH] =?UTF-8?q?Workaround=20menu=20sous=20urho=20surface=20(qu?=
 =?UTF-8?q?i=20pose=20d'autres=20probl=C3=A8mes)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AideDeJeu/AideDeJeu/Views/DicesPage.xaml    | 14 ++++++++++++--
 AideDeJeu/AideDeJeu/Views/DicesPage.xaml.cs |  8 +++++++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/AideDeJeu/AideDeJeu/Views/DicesPage.xaml b/AideDeJeu/AideDeJeu/Views/DicesPage.xaml
index 67978307..6b57fc18 100644
--- a/AideDeJeu/AideDeJeu/Views/DicesPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/DicesPage.xaml
@@ -6,7 +6,14 @@
              xmlns:urho="clr-namespace:Urho.Forms;assembly=UrhoSharp.Forms"
              x:Class="AideDeJeu.Views.DicesPage" 
              Appearing="ContentPage_Appearing"
-             Disappearing="ContentPage_Disappearing" Title="Dés" >
+             Disappearing="ContentPage_Disappearing" 
+             Title="Dés" 
+             Shell.FlyoutBehavior="Disabled"
+             Visual="Material">
+    <!--<Shell.BackButtonBehavior>
+        <BackButtonBehavior Command="{Binding BackCommand}"
+                            IconOverride="back.png" />
+    </Shell.BackButtonBehavior>-->
     <!--Visual="Material"-->
     <ContentPage.Content>
         <StackLayout>
@@ -71,7 +78,10 @@
 
             </skviews:SKCanvasView>-->
 
-            <Button Text="Générer" Clicked="Button_Clicked"/>
+            <StackLayout Orientation="Horizontal" HorizontalOptions="Center">
+                <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>
     </ContentPage.Content>
diff --git a/AideDeJeu/AideDeJeu/Views/DicesPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/DicesPage.xaml.cs
index 307ab89b..d3ca43ce 100644
--- a/AideDeJeu/AideDeJeu/Views/DicesPage.xaml.cs
+++ b/AideDeJeu/AideDeJeu/Views/DicesPage.xaml.cs
@@ -92,6 +92,7 @@ namespace AideDeJeu.Views
             try
             {
                 var ao = new Urho.ApplicationOptions(assetsFolder: null);
+                HelloWorldUrhoSurface = new Urho.Forms.UrhoSurface();
                 charts = await HelloWorldUrhoSurface.Show<Charts>(ao);
             }
             catch(Exception ex)
@@ -116,7 +117,7 @@ namespace AideDeJeu.Views
             charts?.Bars.ForEach(b => b.SetValueWithAnimation((new Dice()).Roll("3d6", new RandomDieRoller()).Value));
         }
 
-        private void Button_Clicked(object sender, EventArgs e)
+        private void Refresh_Clicked(object sender, EventArgs e)
         {
             charts?.Bars.ForEach(b => b.SetValueWithAnimation((new Dice()).Roll("3d6", new RandomDieRoller()).Value));
         }
@@ -133,6 +134,11 @@ namespace AideDeJeu.Views
             }
             catch { }
         }
+
+        private void Menu_Clicked(object sender, EventArgs e)
+        {
+            Shell.Current.GoToAsync("//home", true);
+        }
     }
     public class HelloWorld : Urho.Application
     {