From 9735a0d5a0f65e1e04d9aff685eb3e7363546292 Mon Sep 17 00:00:00 2001 From: luxick Date: Thu, 5 Mar 2020 17:56:16 +0100 Subject: [PATCH] Gtk improvements Squashed commit of the following: commit 724c487ff5feca1e5ed1e0f006dd1c8e0112954b Author: luxick Date: Thu Mar 5 17:56:01 2020 +0100 Reorder player columns commit 5f56f73912122a42c3ee8fc64ed9760d18b9e706 Author: luxick Date: Thu Mar 5 17:52:17 2020 +0100 Data column constructor fix commit fae314804b5bbe1be58ebdcb64690544bae76d1b Author: luxick Date: Thu Mar 5 17:51:39 2020 +0100 Do not cast values in liststore to string --- EstusShots.Gtk/Controls/BindableListControl.cs | 2 +- EstusShots.Gtk/Controls/DataColumn.cs | 2 +- EstusShots.Gtk/Pages/PlayersPage.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/EstusShots.Gtk/Controls/BindableListControl.cs b/EstusShots.Gtk/Controls/BindableListControl.cs index 3c7004b..3d3b364 100644 --- a/EstusShots.Gtk/Controls/BindableListControl.cs +++ b/EstusShots.Gtk/Controls/BindableListControl.cs @@ -84,7 +84,7 @@ namespace EstusShots.Gtk.Controls $"Property '{column.PropertyName}' does not exist on Type '{item.GetType()}'"); var val = prop.GetValue(item); if (column.Format != null) val = column.Format(val); - row.Add(val.ToString()); + row.Add(val); } // The key value must be the first value in the row diff --git a/EstusShots.Gtk/Controls/DataColumn.cs b/EstusShots.Gtk/Controls/DataColumn.cs index 135a8cf..b03900c 100644 --- a/EstusShots.Gtk/Controls/DataColumn.cs +++ b/EstusShots.Gtk/Controls/DataColumn.cs @@ -11,7 +11,7 @@ namespace EstusShots.Gtk.Controls Reorderable = true; } - public DataColumn(string propertyName) + public DataColumn(string propertyName) : this() { PropertyName = propertyName; Title = propertyName; diff --git a/EstusShots.Gtk/Pages/PlayersPage.cs b/EstusShots.Gtk/Pages/PlayersPage.cs index 2b2128d..50d9dbb 100644 --- a/EstusShots.Gtk/Pages/PlayersPage.cs +++ b/EstusShots.Gtk/Pages/PlayersPage.cs @@ -28,8 +28,8 @@ namespace EstusShots.Gtk { new DataColumn(nameof(Player.Name)), new DataColumn(nameof(Player.Alias)), + new DataColumn(nameof(Player.Anonymous)) {Title = "Is Anonymous?", FixedWidth = 120}, new DataColumn(nameof(Player.HexId)) {Title = "Hex ID"}, - new DataColumn(nameof(Player.Anonymous)) {Title = "Is Anonymous?", FixedWidth = 30} }; PlayersControl = new BindableListControl(columns, nameof(Player.PlayerId), PlayersTreeView); PlayersControl.OnSelectionChanged += PlayersControlOnOnSelectionChanged;