From 78509490da38d952adde3eb4cd3ca7a27d2ca776 Mon Sep 17 00:00:00 2001
From: hulivet1 <Hugo.LIVET@etu.uca.fr>
Date: Fri, 14 Oct 2022 15:18:20 +0200
Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20de=20la=20vue=20et=20des=20?=
 =?UTF-8?q?annimation=20en=20WPF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Code/IHM/App.xaml        | 42 +++++++++++++++++++++++++++-------------
 Code/IHM/MainWindow.xaml | 20 +++++++++----------
 2 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/Code/IHM/App.xaml b/Code/IHM/App.xaml
index 812fea3..fef54aa 100644
--- a/Code/IHM/App.xaml
+++ b/Code/IHM/App.xaml
@@ -6,7 +6,7 @@
              StartupUri="MainWindow.xaml">
     <Application.Resources>
 
-        <!--<conv:Func2WindowPartConverter x:Key="Func2WpConv"/>-->
+        <conv:Func2WindowPartConverter x:Key="Func2WpConv"/>
 
         <Style x:Key="BorderRessource" TargetType="Border">
             <Setter Property="BorderBrush" Value="#63A4FF"/>
@@ -27,18 +27,18 @@
         </Style>
 
         <Style TargetType="UserControl" x:Key="ImageFondRessource">
-            <Setter Property="Background">
-                <Setter.Value>
+            <Setter Property="Background" Value="White">
+                <!--<Setter.Value>
                     <VisualBrush>
                         <VisualBrush.Visual>
                             <Image Source="./images/fond.jpg">
-                                <Image.Effect>
-                                    <BlurEffect Radius="10"/>
+                               <Image.Effect>
+                                    <BlurEffect Radius="0"/>
                                 </Image.Effect>
                             </Image>
                         </VisualBrush.Visual>
                     </VisualBrush>
-                </Setter.Value>
+                </Setter.Value>-->
             </Setter>
         </Style>
 
@@ -113,37 +113,53 @@
             <Setter Property="VerticalAlignment" Value="Center"/>
         </Style>
 
-        <SolidColorBrush x:Key="CouleurPrincipale" Color="Blue"/>
+        <SolidColorBrush x:Key="CouleurPrincipale" Color="#23395d"/>
 
         <Style x:Key="BoutonMain" TargetType="Button">
             <Setter Property="Height" Value="40"/>
             <Setter Property="BorderThickness" Value="0"/>
-            <Setter Property="Margin" Value="10,0,0,0"/>
-            <Setter Property="Padding" Value="20"/>
+            <Setter Property="Margin" Value="10,10,0,10" />
+
             <Setter Property="Background" Value="{StaticResource CouleurPrincipale}"/>
+            <Setter Property="FontSize" Value="16"/>
+            <Setter Property="Foreground" Value="White"/>
+
+
+
             <Style.Resources>
+                
                 <Style TargetType="Border">
                     <Setter Property="CornerRadius" Value="20,0,0,20"/>
                 </Style>
             </Style.Resources>
-            
+
+
             <Style.Triggers>
+
                 
-                <Trigger Property="IsPressed" Value="False"><!--True pour que ca marche-->
+
+                <Trigger Property="IsDefault" Value="True">
+                    <Setter Property="Foreground" Value="Black"/>
                     <Trigger.EnterActions>
                         <BeginStoryboard>
                             <Storyboard>
-                                <ColorAnimation Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)" To="White"/>
+                                <ColorAnimation Duration="0:0:0.5" Storyboard.TargetProperty="(Button.Background).(SolidColorBrush.Color)" To="White"/>
                             </Storyboard>
                         </BeginStoryboard>
                     </Trigger.EnterActions>
                 </Trigger>
 
-
                 
+                
+                
+
             </Style.Triggers>
             
         </Style>
 
+
+
+
+
     </Application.Resources>
 </Application>
diff --git a/Code/IHM/MainWindow.xaml b/Code/IHM/MainWindow.xaml
index 71b77c4..fbdb520 100644
--- a/Code/IHM/MainWindow.xaml
+++ b/Code/IHM/MainWindow.xaml
@@ -6,21 +6,21 @@
         xmlns:local="clr-namespace:IHM"
         mc:Ignorable="d"
         Title="MainWindow" Height="450" Width="800">
-    <Grid Background="{StaticResource CouleurPrincipale}">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="0.25*"/>
-            <RowDefinition/>
-        </Grid.RowDefinitions>
-        
+    <Grid>
+
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="0.25*"/>
+            <ColumnDefinition Width="0.30*"/>
             <ColumnDefinition/>
         </Grid.ColumnDefinitions>
 
-        <Image Source="images/logo.png" Margin="10" Grid.Column="0" Grid.Row="0"/>
 
-        <StackPanel Grid.Column="0" Grid.Row="1">
-            <Button Content="Tableau de bord" Style="{StaticResource BoutonMain}"/>
+        
+
+        <StackPanel Grid.Column="0"  Background="{StaticResource CouleurPrincipale}">
+
+            <Image Source="images/logo.png" Margin="10" Grid.Column="0" Grid.Row="0" Width="75"/>
+            
+            <Button Content="Tableau de bord" Style="{StaticResource BoutonMain}" IsDefault="True"/>
             <Button Content="Tableau de bord" Style="{StaticResource BoutonMain}"/>
             <Button Content="Tableau de bord" Style="{StaticResource BoutonMain}"/>
             <Button Content="Tableau de bord" Style="{StaticResource BoutonMain}"/>