From 6c17f34b3cdd841b34907c233ee8d53fe117609d Mon Sep 17 00:00:00 2001
From: Travis Nickles <ryochan7@protonmail.com>
Date: Thu, 12 Mar 2020 08:08:38 -0500
Subject: [PATCH] Added name to ID column

---
 DS4Windows/DS4Forms/MainWindow.xaml                       | 2 +-
 DS4Windows/DS4Forms/ViewModels/ControllerListViewModel.cs | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/DS4Windows/DS4Forms/MainWindow.xaml b/DS4Windows/DS4Forms/MainWindow.xaml
index 1650028..161cc52 100644
--- a/DS4Windows/DS4Forms/MainWindow.xaml
+++ b/DS4Windows/DS4Forms/MainWindow.xaml
@@ -46,7 +46,7 @@
                                 <GridViewColumn x:Name="idColumn" Header="ID" Width="120">
                                     <GridViewColumn.CellTemplate>
                                         <DataTemplate>
-                                            <TextBlock x:Name="idColumnTxtB" Text="{Binding Device.MacAddress, Mode=OneWay}" ToolTip="{Binding TooltipIDText, Mode=OneWay}" ToolTipOpening="IdColumnTxtB_ToolTipOpening" Tag="{Binding DevIndex, Mode=OneTime}"/>
+                                            <TextBlock x:Name="idColumnTxtB" Text="{Binding IdText, Mode=OneWay}" ToolTip="{Binding TooltipIDText, Mode=OneWay}" ToolTipOpening="IdColumnTxtB_ToolTipOpening" Tag="{Binding DevIndex, Mode=OneTime}"/>
                                         </DataTemplate>
                                     </GridViewColumn.CellTemplate>
                                 </GridViewColumn>
diff --git a/DS4Windows/DS4Forms/ViewModels/ControllerListViewModel.cs b/DS4Windows/DS4Forms/ViewModels/ControllerListViewModel.cs
index 5988259..38c3814 100644
--- a/DS4Windows/DS4Forms/ViewModels/ControllerListViewModel.cs
+++ b/DS4Windows/DS4Forms/ViewModels/ControllerListViewModel.cs
@@ -298,6 +298,11 @@ namespace DS4WinWPF.DS4Forms.ViewModels
         private ContextMenu lightContext;
         public ContextMenu LightContext { get => lightContext; set => lightContext = value; }
 
+        public string IdText
+        {
+            get => $"{device.DisplayName} ({device.MacAddress})";
+        }
+
         public delegate void CustomColorHandler(CompositeDeviceModel sender);
         public event CustomColorHandler RequestColorPicker;