Changeset 6 for Common

Timestamp:

Apr 4, 2019, 10:21:48 AM (6 years ago)

Author:

chronos

Message:

• Fixed: Prompt listbox error if initial value was set to null.

File:

• Common/Prompt.cs (modified) (2 diffs)

Common/Prompt.cs

@@ -152 +152 @@
             };
             Label textLabel = new Label() { Left = 50, Top = 20, AutoSize = true, Text = text };
+            Button confirmation = new Button()
+            {
+                Text = "Ok",
+                Left = 350,
+                Width = 100,
+                Top = 70 + dataSize,
+                DialogResult = DialogResult.OK,
+                Anchor = AnchorStyles.Bottom | AnchorStyles.Right
+            };
+            confirmation.Click += (sender, e) => { prompt.Close(); };
             ListBox listBox = new ListBox() { Left = 50, Top = 44, Width = 400, Height = dataSize,
                 Anchor = AnchorStyles.Bottom | AnchorStyles.Right | AnchorStyles.Top | AnchorStyles.Left
             };
+            listBox.SelectedIndexChanged += (sender, e) =>
+            {
+                confirmation.Enabled = listBox.SelectedItems.Count > 0;
+            };
             listBox.Items.AddRange(states);
-            int itemIndex = listBox.Items.IndexOf(initialValue);
+            confirmation.Enabled = listBox.SelectedItems.Count > 0;
+            listBox.DoubleClick += (sender, e) => { confirmation.PerformClick(); };
+            int itemIndex = -1;
+            if (initialValue != null) itemIndex = listBox.Items.IndexOf(initialValue);
             if (itemIndex >= 0)
             {
@@ -165 +182 @@
                 listBox.SelectedIndex = 0;
             }
-            Button confirmation = new Button() { Text = "Ok", Left = 350, Width = 100, Top = 70 + dataSize,
-                DialogResult = DialogResult.OK, Anchor = AnchorStyles.Bottom | AnchorStyles.Right };
-            confirmation.Click += (sender, e) => { prompt.Close(); };
-            listBox.DoubleClick += (sender, e) => { confirmation.PerformClick(); };
 
             prompt.Controls.Add(listBox);