From 5d68386fc1f436df88c65b4f6d26b765c8ab7bd0 Mon Sep 17 00:00:00 2001
From: Pat <patrycja.lazna@gmail.com>
Date: Thu, 31 Jan 2019 09:40:28 +0100
Subject: [PATCH] images not displayed in cirlcle

---
 .../Magazyn/Windows/AmountWindow.xaml         |  8 ++-----
 .../Magazyn/Windows/AmountWindow.xaml.cs      |  2 +-
 .../Magazyn/Windows/InfoWindow.xaml           | 22 +++++++++----------
 .../Magazyn/Windows/InfoWindow.xaml.cs        |  2 +-
 4 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml b/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml
index 736004c..d650617 100644
--- a/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml
+++ b/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml
@@ -19,14 +19,10 @@
 
     <Grid>
         <TextBlock x:Name="fruitName" HorizontalAlignment="Left" Margin="60,125,0,0" TextWrapping="Wrap" Text="fruitName" Width="76" Height="16" VerticalAlignment="Top" TextAlignment="Center"/>
-        <TextBlock x:Name="messageBox" HorizontalAlignment="Left" Margin="24,74,0,0" TextWrapping="Wrap" Text="messageBox" VerticalAlignment="Top" Width="290" Height="39" TextAlignment="Center" FontWeight="Bold"/>
+        <TextBlock x:Name="messageBox" HorizontalAlignment="Left" Margin="28,80,0,0" TextWrapping="Wrap" Text="messageBox" VerticalAlignment="Top" Width="290" Height="39" TextAlignment="Center" FontWeight="Bold"/>
         <TextBox x:Name="amountToChange" Margin="0,109,65,0" TextWrapping="Wrap" Text="" RenderTransformOrigin="1.456,0.316" Height="32" VerticalAlignment="Top" HorizontalAlignment="Right" Width="89" TextAlignment="Center"/>
         <Button x:Name="saveButton" Content="Zastosuj" Margin="0,0,66,10" VerticalAlignment="Bottom" Click="saveButton_Click" Width="90" HorizontalAlignment="Right"/>
         <Button x:Name="cancelButton" Content="Anuluj" Margin="60,0,0,10" VerticalAlignment="Bottom" Click="cancelButton_Click" Width="90" HorizontalAlignment="Left" />
-        <Ellipse  HorizontalAlignment="Left" Width="60" Height="60" Margin="134,10,0,155.333">
-            <Ellipse.Fill>
-                <ImageBrush x:Name="fruitImage"/>
-            </Ellipse.Fill>
-        </Ellipse>
+        <Image x:Name="fruitImage" HorizontalAlignment="Left" Height="64" Margin="140,5,0,0" VerticalAlignment="Top" Width="64"/>
     </Grid>
 </Window>
diff --git a/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml.cs b/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml.cs
index 48b1ef7..5c6774d 100644
--- a/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml.cs
+++ b/Magazyn_Client/Magazyn/Windows/AmountWindow.xaml.cs
@@ -50,7 +50,7 @@ namespace Magazyn.Windows
 
             try
             {
-                fruitImage.ImageSource = fruit.ImageSource;
+                fruitImage.Source = fruit.ImageSource;
             }
             catch (Exception ex)
             {
diff --git a/Magazyn_Client/Magazyn/Windows/InfoWindow.xaml b/Magazyn_Client/Magazyn/Windows/InfoWindow.xaml
index 623438c..254d640 100644
--- a/Magazyn_Client/Magazyn/Windows/InfoWindow.xaml
+++ b/Magazyn_Client/Magazyn/Windows/InfoWindow.xaml
@@ -17,16 +17,16 @@
         mc:Ignorable="d"
         Title="Informacje o: " WindowStartupLocation="CenterOwner" Height="250" Width="340" ResizeMode="NoResize" Keyboard.KeyDown="Window_KeyDown">
     <Grid>
-        <TextBlock x:Name="fruitName" Margin="37,70,48.333,0" TextWrapping="Wrap" Text="fruitName" Height="16" VerticalAlignment="Top" FontWeight="Bold"/>
-        <TextBlock x:Name="fruitPrice" Margin="37,91,49.333,0" TextWrapping="Wrap" Text="fruitPrice" Height="16" VerticalAlignment="Top" FontWeight="Bold"/>
-        <TextBlock x:Name="fruitQuantity" Margin="37,112,49.333,0" TextWrapping="Wrap" Text="fruitQuantity" Height="16" VerticalAlignment="Top" FontWeight="Bold"/>
-        <TextBlock x:Name="fruitQuantityMax" Margin="37,133,49.333,0" TextWrapping="Wrap" Text="fruitQuantityMax" Height="16" VerticalAlignment="Top" FontWeight="Bold"/>
-        <TextBlock x:Name="fruitValue" Margin="37,154,50.333,0" TextWrapping="Wrap" Text="fruitValue" Height="16" VerticalAlignment="Top" FontWeight="Bold"/>
-        <Button x:Name="okButton" Content="Ok" Margin="0,0,9,10" VerticalAlignment="Bottom" Click="okButton_Click" Width="75" HorizontalAlignment="Right"/>
-        <Ellipse  HorizontalAlignment="Left" Width="60" Height="60" Margin="134,10,0,155.333">
-            <Ellipse.Fill>
-                <ImageBrush x:Name="fruitImage"/>
-            </Ellipse.Fill>
-        </Ellipse>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="47*"/>
+            <RowDefinition Height="175*"/>
+        </Grid.RowDefinitions>
+        <TextBlock x:Name="fruitName" Margin="37,28.667,50.667,0" TextWrapping="Wrap" Text="fruitName" Height="16" VerticalAlignment="Top" FontWeight="Bold" Grid.Row="1"/>
+        <TextBlock x:Name="fruitPrice" Margin="38,49.178,49.667,0" TextWrapping="Wrap" Text="fruitPrice" Height="16" VerticalAlignment="Top" FontWeight="Bold" Grid.Row="1"/>
+        <TextBlock x:Name="fruitQuantity" Margin="37,70.178,49.667,0" TextWrapping="Wrap" Text="fruitQuantity" Height="16" VerticalAlignment="Top" FontWeight="Bold" Grid.Row="1"/>
+        <TextBlock x:Name="fruitQuantityMax" Margin="37,91.178,49.667,0" TextWrapping="Wrap" Text="fruitQuantityMax" Height="16" VerticalAlignment="Top" FontWeight="Bold" Grid.Row="1"/>
+        <TextBlock x:Name="fruitValue" Margin="37,112.178,49.667,0" TextWrapping="Wrap" Text="fruitValue" Height="16" VerticalAlignment="Top" FontWeight="Bold" Grid.Row="1"/>
+        <Button x:Name="okButton" Content="Ok" Margin="0,0,8.667,10" VerticalAlignment="Bottom" Click="okButton_Click" Width="75" HorizontalAlignment="Right" Grid.Row="1"/>
+        <Image x:Name="fruitImage" HorizontalAlignment="Left" Height="64" Margin="140,5,0,0" VerticalAlignment="Top" Width="64" Grid.RowSpan="2"/>
     </Grid>
 </Window>
diff --git a/Magazyn_Client/Magazyn/Windows/InfoWindow.xaml.cs b/Magazyn_Client/Magazyn/Windows/InfoWindow.xaml.cs
index 72db372..0234a90 100644
--- a/Magazyn_Client/Magazyn/Windows/InfoWindow.xaml.cs
+++ b/Magazyn_Client/Magazyn/Windows/InfoWindow.xaml.cs
@@ -37,7 +37,7 @@ namespace Magazyn.Windows
 
             try
             {
-                fruitImage.ImageSource = fruit.ImageSource;
+                fruitImage.Source = fruit.ImageSource;
             }
             catch (Exception ex)
             {