From 789e0ebed7cf600e99949446088565f3cfe3a0cb Mon Sep 17 00:00:00 2001
From: Yan Maniez <yan.maniez@atos.net>
Date: Sun, 20 Oct 2019 01:04:50 +0200
Subject: [PATCH] => ContentView

---
 .../Views/Pickers/ItemPickerView.xaml         | 20 +++++++++----------
 .../Views/Pickers/ItemPickerView.xaml.cs      | 10 +++++-----
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/AideDeJeu/AideDeJeu/Views/Pickers/ItemPickerView.xaml b/AideDeJeu/AideDeJeu/Views/Pickers/ItemPickerView.xaml
index 6eb7facf..2b118490 100644
--- a/AideDeJeu/AideDeJeu/Views/Pickers/ItemPickerView.xaml
+++ b/AideDeJeu/AideDeJeu/Views/Pickers/ItemPickerView.xaml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<StackLayout xmlns="http://xamarin.com/schemas/2014/forms" 
+<ContentView xmlns="http://xamarin.com/schemas/2014/forms" 
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
         xmlns:tools="clr-namespace:AideDeJeu.Tools"
         xmlns:mdview="clr-namespace:Xam.Forms.Markdown"
              x:Class="AideDeJeu.Views.Pickers.ItemPickerView"
              x:Name="this">
-    <StackLayout.Resources>
+    <ContentView.Resources>
         <ResourceDictionary>
             <tools:MonsterMarkdownTheme x:Key="MonsterMarkdownTheme" />
             <tools:NullToFalseConverter x:Key="NullToFalseConverter" />
         </ResourceDictionary>
-    </StackLayout.Resources>
-    <StackLayout.Triggers>
-        <DataTrigger TargetType="StackLayout" Binding="{Binding Source={x:Reference this}, Path=IsEnabled}" Value="False">
+    </ContentView.Resources>
+    <ContentView.Triggers>
+        <DataTrigger TargetType="ContentView" Binding="{Binding Source={x:Reference this}, Path=IsEnabled}" Value="False">
             <Setter Property="Opacity" Value="0.5" />
         </DataTrigger>
-        <DataTrigger TargetType="StackLayout" Binding="{Binding Source={x:Reference this}, Path=IsEnabled}" Value="True">
+        <DataTrigger TargetType="ContentView" Binding="{Binding Source={x:Reference this}, Path=IsEnabled}" Value="True">
             <Setter Property="Opacity" Value="1" />
         </DataTrigger>
-    </StackLayout.Triggers>
+    </ContentView.Triggers>
     <Frame BorderColor="Black" Padding="2" Margin="10">
         <Grid>
             <Grid.ColumnDefinitions>
@@ -45,8 +45,8 @@
             </DataTemplate>
         </BindableLayout.ItemTemplate>
     </StackLayout>-->
-    <StackLayout.GestureRecognizers>
+    <ContentView.GestureRecognizers>
         <ClickGestureRecognizer Command="{Binding PickerCommand, Source={x:Reference this}}" CommandParameter="{Binding ItemsSource, Source={x:Reference this}}" />
         <TapGestureRecognizer Command="{Binding PickerCommand, Source={x:Reference this}}" CommandParameter="{Binding ItemsSource, Source={x:Reference this}}" />
-    </StackLayout.GestureRecognizers>
-</StackLayout>
\ No newline at end of file
+    </ContentView.GestureRecognizers>
+</ContentView>
\ No newline at end of file
diff --git a/AideDeJeu/AideDeJeu/Views/Pickers/ItemPickerView.xaml.cs b/AideDeJeu/AideDeJeu/Views/Pickers/ItemPickerView.xaml.cs
index 2221bf74..7afb2f18 100644
--- a/AideDeJeu/AideDeJeu/Views/Pickers/ItemPickerView.xaml.cs
+++ b/AideDeJeu/AideDeJeu/Views/Pickers/ItemPickerView.xaml.cs
@@ -12,7 +12,7 @@ using Xamarin.Forms.Xaml;
 namespace AideDeJeu.Views.Pickers
 {
     [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class ItemPickerView : StackLayout
+    public partial class ItemPickerView : ContentView
     {
         public MainViewModel Main
         {
@@ -73,10 +73,10 @@ namespace AideDeJeu.Views.Pickers
         //    defaultValue: new List<string>());
         public static readonly BindableProperty ItemsSourceProperty =
             BindableProperty.Create(
-                nameof(ItemsSource), 
-                typeof(System.Collections.IEnumerable), 
-                typeof(ItemPickerView), 
-                default(System.Collections.IEnumerable));
+                nameof(ItemsSource),
+                typeof(System.Collections.IEnumerable),
+                typeof(ItemPickerView),
+                defaultValue: null); // default(System.Collections.IEnumerable));
 
         public ICommand PickerCommand
         {