From 062b03547accd8321219e329f93f2d1eb7956201 Mon Sep 17 00:00:00 2001
From: Yan Maniez <yanmaniez@hotmail.com>
Date: Wed, 8 May 2019 20:47:53 +0200
Subject: [PATCH] Ajustement grid

---
 .../Views/PlayerCharacter/AbilitiesView.xaml  | 83 ++++++++++---------
 1 file changed, 44 insertions(+), 39 deletions(-)

diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/AbilitiesView.xaml b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/AbilitiesView.xaml
index b62d1b5a..0104df9a 100644
--- a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/AbilitiesView.xaml
+++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/AbilitiesView.xaml
@@ -36,11 +36,10 @@
                 <Frame Grid.Row="1" Grid.ColumnSpan="3" BorderColor="Black" Padding="2" Margin="10">
                     <Grid ColumnSpacing="15" RowSpacing="10" Margin="15">
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="auto" />
-                            <ColumnDefinition Width="auto" />
-                            <ColumnDefinition Width="auto" />
-                            <ColumnDefinition Width="auto" />
-                            <ColumnDefinition Width="auto" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
                             <RowDefinition Height="auto" />
@@ -50,47 +49,53 @@
                             <RowDefinition Height="auto" />
                             <RowDefinition Height="auto" />
                             <RowDefinition Height="auto" />
+                            <RowDefinition Height="auto" />
+                            <RowDefinition Height="auto" />
+                            <RowDefinition Height="auto" />
+                            <RowDefinition Height="auto" />
+                            <RowDefinition Height="auto" />
+                            <RowDefinition Height="auto" />
                         </Grid.RowDefinitions>
-                        <Label Grid.Column="1" Text="Base" HorizontalTextAlignment="Center" />
-                        <Label Grid.Column="2" Text="Bonus" HorizontalTextAlignment="Center"/>
-                        <Label Grid.Column="3" Text="Valeur" HorizontalTextAlignment="Center"/>
-                        <Label Grid.Column="4" Text="Mod" HorizontalTextAlignment="Center"/>
+                        <Label Grid.Column="0" Text="Base" HorizontalTextAlignment="Center" />
+                        <Label Grid.Column="1" Text="Bonus" HorizontalTextAlignment="Center"/>
+                        <Label Grid.Column="2" Text="Valeur" HorizontalTextAlignment="Center"/>
+                        <Label Grid.Column="3" Text="Mod" HorizontalTextAlignment="Center"/>
 
-                        <Label Grid.Row="1" Grid.Column="0" Text="Force" VerticalTextAlignment="Center" FontSize="Medium" />
-                        <pcviews:AbilityBaseValueView Grid.Row="1" Grid.Column="1" BindingContext="{Binding}" Ability="{Binding SelectedPlayerCharacter.Abilities.Strength}" />
-                        <pcviews:AbilityRacialBonusView Grid.Row="1" Grid.Column="2" BindingContext="{Binding}" Ability="{Binding SelectedPlayerCharacter.Abilities.Strength}" />
-                        <Label Grid.Row="1" Grid.Column="3" Text="{Binding SelectedPlayerCharacter.Abilities.Strength.Value, FallbackValue=''}" VerticalTextAlignment="Center" FontSize="Medium" HorizontalTextAlignment="Center"/>
-                        <Label Grid.Row="1" Grid.Column="4" Text="{Binding SelectedPlayerCharacter.Abilities.Strength.Mod, StringFormat='{}{0:+0;-#}', FallbackValue=''}" VerticalTextAlignment="Center" FontSize="Medium" HorizontalTextAlignment="Center"/>
+                        <Label Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="4" Text="Force" VerticalTextAlignment="Center" FontSize="Medium" />
+                        <pcviews:AbilityBaseValueView Grid.Row="2" Grid.Column="0" BindingContext="{Binding}" Ability="{Binding SelectedPlayerCharacter.Abilities.Strength}" />
+                        <pcviews:AbilityRacialBonusView Grid.Row="2" Grid.Column="1" BindingContext="{Binding}" Ability="{Binding SelectedPlayerCharacter.Abilities.Strength}" />
+                        <Label Grid.Row="2" Grid.Column="2" Text="{Binding SelectedPlayerCharacter.Abilities.Strength.Value, FallbackValue=''}" VerticalTextAlignment="Center" FontSize="Medium" HorizontalTextAlignment="Center"/>
+                        <Label Grid.Row="2" Grid.Column="3" Text="{Binding SelectedPlayerCharacter.Abilities.Strength.Mod, StringFormat='{}{0:+0;-#}', FallbackValue=''}" VerticalTextAlignment="Center" FontSize="Medium" HorizontalTextAlignment="Center"/>
 
-                        <Label Grid.Row="2" Grid.Column="0" Text="Dextérité" VerticalTextAlignment="Center" FontSize="Medium" />
-                        <pcviews:AbilityBaseValueView Grid.Row="2" Grid.Column="1" BindingContext="{Binding}" Ability="{Binding SelectedPlayerCharacter.Abilities.Dexterity}" />
-                        <pcviews:AbilityRacialBonusView Grid.Row="2" Grid.Column="2" BindingContext="{Binding}" Ability="{Binding SelectedPlayerCharacter.Abilities.Dexterity}" />
-                        <Label Grid.Row="2" Grid.Column="3" Text="{Binding SelectedPlayerCharacter.Abilities.Dexterity.Value, FallbackValue=''}" VerticalTextAlignment="Center" FontSize="Medium" HorizontalTextAlignment="Center"/>
-                        <Label Grid.Row="2" Grid.Column="4" Text="{Binding SelectedPlayerCharacter.Abilities.Dexterity.Mod, StringFormat='{}{0:+0;-#}', FallbackValue=''}" VerticalTextAlignment="Center" FontSize="Medium" HorizontalTextAlignment="Center"/>
+                        <Label Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="4" Text="Dextérité" VerticalTextAlignment="Center" FontSize="Medium" />
+                        <pcviews:AbilityBaseValueView Grid.Row="4" Grid.Column="0" BindingContext="{Binding}" Ability="{Binding SelectedPlayerCharacter.Abilities.Dexterity}" />
+                        <pcviews:AbilityRacialBonusView Grid.Row="4" Grid.Column="1" BindingContext="{Binding}" Ability="{Binding SelectedPlayerCharacter.Abilities.Dexterity}" />
+                        <Label Grid.Row="4" Grid.Column="2" Text="{Binding SelectedPlayerCharacter.Abilities.Dexterity.Value, FallbackValue=''}" VerticalTextAlignment="Center" FontSize="Medium" HorizontalTextAlignment="Center"/>
+                        <Label Grid.Row="4" Grid.Column="3" Text="{Binding SelectedPlayerCharacter.Abilities.Dexterity.Mod, StringFormat='{}{0:+0;-#}', FallbackValue=''}" VerticalTextAlignment="Center" FontSize="Medium" HorizontalTextAlignment="Center"/>
 
-                        <Label Grid.Row="3" Grid.Column="0" Text="Constitution" VerticalTextAlignment="Center" FontSize="Medium" />
-                        <pcviews:AbilityBaseValueView Grid.Row="3" Grid.Column="1" BindingContext="{Binding}" Ability="{Binding SelectedPlayerCharacter.Abilities.Constitution}" />
-                        <pcviews:AbilityRacialBonusView Grid.Row="3" Grid.Column="2" BindingContext="{Binding}" Ability="{Binding SelectedPlayerCharacter.Abilities.Constitution}" />
-                        <Label Grid.Row="3" Grid.Column="3" Text="{Binding SelectedPlayerCharacter.Abilities.Constitution.Value, FallbackValue=''}" VerticalTextAlignment="Center" FontSize="Medium" HorizontalTextAlignment="Center"/>
-                        <Label Grid.Row="3" Grid.Column="4" Text="{Binding SelectedPlayerCharacter.Abilities.Constitution.Mod, StringFormat='{}{0:+0;-#}', FallbackValue=''}" VerticalTextAlignment="Center" FontSize="Medium" HorizontalTextAlignment="Center"/>
+                        <Label Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="4" Text="Constitution" VerticalTextAlignment="Center" FontSize="Medium" />
+                        <pcviews:AbilityBaseValueView Grid.Row="6" Grid.Column="0" BindingContext="{Binding}" Ability="{Binding SelectedPlayerCharacter.Abilities.Constitution}" />
+                        <pcviews:AbilityRacialBonusView Grid.Row="6" Grid.Column="1" BindingContext="{Binding}" Ability="{Binding SelectedPlayerCharacter.Abilities.Constitution}" />
+                        <Label Grid.Row="6" Grid.Column="2" Text="{Binding SelectedPlayerCharacter.Abilities.Constitution.Value, FallbackValue=''}" VerticalTextAlignment="Center" FontSize="Medium" HorizontalTextAlignment="Center"/>
+                        <Label Grid.Row="6" Grid.Column="3" Text="{Binding SelectedPlayerCharacter.Abilities.Constitution.Mod, StringFormat='{}{0:+0;-#}', FallbackValue=''}" VerticalTextAlignment="Center" FontSize="Medium" HorizontalTextAlignment="Center"/>
 
-                        <Label Grid.Row="4" Grid.Column="0" Text="Intelligence" VerticalTextAlignment="Center" FontSize="Medium" />
-                        <pcviews:AbilityBaseValueView Grid.Row="4" Grid.Column="1" BindingContext="{Binding}" Ability="{Binding SelectedPlayerCharacter.Abilities.Intelligence}" />
-                        <pcviews:AbilityRacialBonusView Grid.Row="4" Grid.Column="2" BindingContext="{Binding}" Ability="{Binding SelectedPlayerCharacter.Abilities.Intelligence}" />
-                        <Label Grid.Row="4" Grid.Column="3" Text="{Binding SelectedPlayerCharacter.Abilities.Intelligence.Value, FallbackValue=''}" VerticalTextAlignment="Center" FontSize="Medium" HorizontalTextAlignment="Center"/>
-                        <Label Grid.Row="4" Grid.Column="4" Text="{Binding SelectedPlayerCharacter.Abilities.Intelligence.Mod, StringFormat='{}{0:+0;-#}', FallbackValue=''}" VerticalTextAlignment="Center" FontSize="Medium" HorizontalTextAlignment="Center"/>
+                        <Label Grid.Row="7" Grid.Column="0" Grid.ColumnSpan="4" Text="Intelligence" VerticalTextAlignment="Center" FontSize="Medium" />
+                        <pcviews:AbilityBaseValueView Grid.Row="8" Grid.Column="0" BindingContext="{Binding}" Ability="{Binding SelectedPlayerCharacter.Abilities.Intelligence}" />
+                        <pcviews:AbilityRacialBonusView Grid.Row="8" Grid.Column="1" BindingContext="{Binding}" Ability="{Binding SelectedPlayerCharacter.Abilities.Intelligence}" />
+                        <Label Grid.Row="8" Grid.Column="2" Text="{Binding SelectedPlayerCharacter.Abilities.Intelligence.Value, FallbackValue=''}" VerticalTextAlignment="Center" FontSize="Medium" HorizontalTextAlignment="Center"/>
+                        <Label Grid.Row="8" Grid.Column="3" Text="{Binding SelectedPlayerCharacter.Abilities.Intelligence.Mod, StringFormat='{}{0:+0;-#}', FallbackValue=''}" VerticalTextAlignment="Center" FontSize="Medium" HorizontalTextAlignment="Center"/>
 
-                        <Label Grid.Row="5" Grid.Column="0" Text="Sagesse" VerticalTextAlignment="Center" FontSize="Medium" />
-                        <pcviews:AbilityBaseValueView Grid.Row="5" Grid.Column="1" BindingContext="{Binding}" Ability="{Binding SelectedPlayerCharacter.Abilities.Wisdom}" />
-                        <pcviews:AbilityRacialBonusView Grid.Row="5" Grid.Column="2" BindingContext="{Binding}" Ability="{Binding SelectedPlayerCharacter.Abilities.Wisdom}" />
-                        <Label Grid.Row="5" Grid.Column="3" Text="{Binding SelectedPlayerCharacter.Abilities.Wisdom.Value, FallbackValue=''}" VerticalTextAlignment="Center" FontSize="Medium" HorizontalTextAlignment="Center"/>
-                        <Label Grid.Row="5" Grid.Column="4" Text="{Binding SelectedPlayerCharacter.Abilities.Wisdom.Mod, StringFormat='{}{0:+0;-#}', FallbackValue=''}" VerticalTextAlignment="Center" FontSize="Medium" HorizontalTextAlignment="Center"/>
+                        <Label Grid.Row="9" Grid.Column="0" Grid.ColumnSpan="4" Text="Sagesse" VerticalTextAlignment="Center" FontSize="Medium" />
+                        <pcviews:AbilityBaseValueView Grid.Row="10" Grid.Column="0" BindingContext="{Binding}" Ability="{Binding SelectedPlayerCharacter.Abilities.Wisdom}" />
+                        <pcviews:AbilityRacialBonusView Grid.Row="10" Grid.Column="1" BindingContext="{Binding}" Ability="{Binding SelectedPlayerCharacter.Abilities.Wisdom}" />
+                        <Label Grid.Row="10" Grid.Column="2" Text="{Binding SelectedPlayerCharacter.Abilities.Wisdom.Value, FallbackValue=''}" VerticalTextAlignment="Center" FontSize="Medium" HorizontalTextAlignment="Center"/>
+                        <Label Grid.Row="10" Grid.Column="3" Text="{Binding SelectedPlayerCharacter.Abilities.Wisdom.Mod, StringFormat='{}{0:+0;-#}', FallbackValue=''}" VerticalTextAlignment="Center" FontSize="Medium" HorizontalTextAlignment="Center"/>
 
-                        <Label Grid.Row="6" Grid.Column="0" Text="Charisme" VerticalTextAlignment="Center" FontSize="Medium" />
-                        <pcviews:AbilityBaseValueView Grid.Row="6" Grid.Column="1" BindingContext="{Binding}" Ability="{Binding SelectedPlayerCharacter.Abilities.Charisma}" />
-                        <pcviews:AbilityRacialBonusView Grid.Row="6" Grid.Column="2" BindingContext="{Binding}" Ability="{Binding SelectedPlayerCharacter.Abilities.Charisma}" />
-                        <Label Grid.Row="6" Grid.Column="3" Text="{Binding SelectedPlayerCharacter.Abilities.Charisma.Value, FallbackValue=''}" VerticalTextAlignment="Center" FontSize="Medium" HorizontalTextAlignment="Center"/>
-                        <Label Grid.Row="6" Grid.Column="4" Text="{Binding SelectedPlayerCharacter.Abilities.Charisma.Mod, StringFormat='{}{0:+0;-#}', FallbackValue=''}" VerticalTextAlignment="Center" FontSize="Medium" HorizontalTextAlignment="Center"/>
+                        <Label Grid.Row="11" Grid.Column="0" Grid.ColumnSpan="4" Text="Charisme" VerticalTextAlignment="Center" FontSize="Medium" />
+                        <pcviews:AbilityBaseValueView Grid.Row="12" Grid.Column="0" BindingContext="{Binding}" Ability="{Binding SelectedPlayerCharacter.Abilities.Charisma}" />
+                        <pcviews:AbilityRacialBonusView Grid.Row="12" Grid.Column="1" BindingContext="{Binding}" Ability="{Binding SelectedPlayerCharacter.Abilities.Charisma}" />
+                        <Label Grid.Row="12" Grid.Column="2" Text="{Binding SelectedPlayerCharacter.Abilities.Charisma.Value, FallbackValue=''}" VerticalTextAlignment="Center" FontSize="Medium" HorizontalTextAlignment="Center"/>
+                        <Label Grid.Row="12" Grid.Column="3" Text="{Binding SelectedPlayerCharacter.Abilities.Charisma.Mod, StringFormat='{}{0:+0;-#}', FallbackValue=''}" VerticalTextAlignment="Center" FontSize="Medium" HorizontalTextAlignment="Center"/>
                     </Grid>
                 </Frame>
             </Grid>