EnumDropDown: bug fix where cached value wasn't updated on selected i…

…tem changed
RiJo · Apr 12, 2018 · b41d0cc · b41d0cc
1 parent ea3e36a
commit b41d0cc
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/UserInterface/Controls/EnumDropDown.cs b/UserInterface/Controls/EnumDropDown.cs
@@ -32,7 +32,7 @@ public partial class EnumDropDown : ComboBox
         protected class ComboboxItem
         {
             public string Text { get; set; }
-            public long Value { get; set; }
+            public Enum Value { get; set; }
 
             public override string ToString()
             {
@@ -46,6 +46,7 @@ public EnumDropDown()
             InitializeComponent();
 
             DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            SelectedIndexChanged += (sender, e) => { enumValue = ((ComboboxItem)SelectedItem).Value; };
         }
 
         public Func<Enum, string> EnumText
@@ -77,7 +78,7 @@ public Type EnumType
 
                 Items.Clear();
                 foreach (Enum item in Enum.GetValues(value))
-                    Items.Add(new ComboboxItem() { Value = item.GetInt64(), Text = (EnumText != null) ? EnumText(item) : item.ToString() });
+                    Items.Add(new ComboboxItem() { Value = item, Text = (EnumText != null) ? EnumText(item) : item.ToString() });
             }
         }
 
@@ -95,12 +96,11 @@ public Enum EnumValue
 
                 if (value == enumValue)
                     return;
-                enumValue = value;
 
                 long numeric = value.GetInt64();
                 foreach (ComboboxItem item in Items)
                 {
-                    if (item.Value != numeric)
+                    if (item.Value.GetInt64() != numeric)
                         continue;
 
                     SelectedItem = item;