From 163afa21d9797256d2195b8b8a48947afafa92d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dulski?= <dulski.michal@outlook.com>
Date: Wed, 3 Apr 2019 11:52:48 +0200
Subject: [PATCH] =?UTF-8?q?Skalowanie=20okna=20i=20informacje=20o=20zawart?=
 =?UTF-8?q?o=C5=9Bci=20=C5=9Bmieci=20w=20=C5=9Bmieciarce?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Trunk/Interface/CzokoŚmieciarka.WPFv2/MainWindow.xaml    | 6 +++---
 Trunk/Interface/CzokoŚmieciarka.WPFv2/MainWindow.xaml.cs | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Trunk/Interface/CzokoŚmieciarka.WPFv2/MainWindow.xaml b/Trunk/Interface/CzokoŚmieciarka.WPFv2/MainWindow.xaml
index e4dcd92..fe91d13 100644
--- a/Trunk/Interface/CzokoŚmieciarka.WPFv2/MainWindow.xaml
+++ b/Trunk/Interface/CzokoŚmieciarka.WPFv2/MainWindow.xaml
@@ -9,8 +9,8 @@
         KeyDown="MainWindow_OnKeyDown">
     <Grid>
         <Grid Name="Board"  Margin="0,0,200,0"/>
-        <DataGrid Name="CollectorInfo" Margin="800,0,0,0"/>
-        <Grid Name="CollectorBoard" Margin="0,0,200,0"/>    
-        
+        <DataGrid Name="CollectorInfo" HorizontalAlignment="Right" Width="192"/>
+        <Grid Name="CollectorBoard" Margin="0,0,200,0"/>
+
     </Grid>
 </Window>
diff --git a/Trunk/Interface/CzokoŚmieciarka.WPFv2/MainWindow.xaml.cs b/Trunk/Interface/CzokoŚmieciarka.WPFv2/MainWindow.xaml.cs
index a392c67..7531163 100644
--- a/Trunk/Interface/CzokoŚmieciarka.WPFv2/MainWindow.xaml.cs
+++ b/Trunk/Interface/CzokoŚmieciarka.WPFv2/MainWindow.xaml.cs
@@ -71,9 +71,10 @@ namespace CzokoŚmieciarka.WPFv2
             Grid.SetColumn(garbageCollector.Image, garbageCollector.Position.X);
             CollectorBoard.Children.Add(garbageCollector.Image);
             CollectorBoard.ShowGridLines = true;
-            CollectorInfo.Items.Add(garbageCollector);
-            CollectorInfo.Columns.Add(new DataGridTextColumn {Header="X", Binding = new Binding("Position.X")});
-            CollectorInfo.Columns.Add(new DataGridTextColumn { Header = "Y", Binding = new Binding("Position.Y") });
+            CollectorInfo.ItemsSource = garbageCollector.TrashContainers;
+            //CollectorInfo.Items.Add(garbageCollector);
+            //CollectorInfo.Columns.Add(new DataGridTextColumn {Header="X", Binding = new Binding("Position.X")});
+            //CollectorInfo.Columns.Add(new DataGridTextColumn { Header = "Y", Binding = new Binding("Position.Y") });
         }
 
         private void MainWindow_OnKeyDown(object sender, KeyEventArgs e)
@@ -88,6 +89,7 @@ namespace CzokoŚmieciarka.WPFv2
             Grid.SetRow(garbageCollector.Image, garbageCollector.Position.Y);
             Grid.SetColumn(garbageCollector.Image, garbageCollector.Position.X);
             CollectorBoard.Children.Add(garbageCollector.Image);
+
         }
     }
 }