Merge pull request 'lab2_fix' (#1) from lab2_fix into lab2

Reviewed-on: #1

WinFormSolution/Components/Components.csproj

@@ -7,7 +7,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<Authors>ns.potapov</Authors>
-		<VersionPrefix>1.0.5</VersionPrefix>
+		<VersionPrefix>1.0.3</VersionPrefix>
 		<Version>$(VersionPrefix)</Version>
 	</PropertyGroup>
 

WinFormSolution/Components/Exceptions/MaxCheckedItemsCountExceedException.cs

@@ -1,13 +0,0 @@
-namespace Components.Exceptions
-{
-    internal class MaxCheckedItemsCountExceedException : Exception
-    {
-        public MaxCheckedItemsCountExceedException()
-        {
-        }
-
-        public MaxCheckedItemsCountExceedException(string? message) : base(message)
-        {
-        }
-    }
-}

WinFormSolution/Components/UserControlCheckedList.cs

@@ -1,24 +1,10 @@
-using Components.Exceptions;
+namespace Components
-
-namespace Components
 {
-    public enum Types : int
-    {
-        Exception = 0,
-        DeleteFirst = 1,
-
-    }
-
-
     public partial class UserControlCheckedList : UserControl
     {
+        private List<int> _lastCheckedIndexes = new List<int>();
         public int MaxCheckedItemsCount { get; set; } = 1;
-        private Types typeOfMaxChecked = Types.DeleteFirst;
         private EventHandler _onCheckedItemChangedEvent;
-        public void ChangeTypeOfMaxChecked(Types type)
-        {
-            typeOfMaxChecked = type;
-        }
         public event EventHandler CheckedItemChanged
         {
             add
@@ -44,25 +30,6 @@ namespace Components
                 }
             }
         }
-        public List<string> CheckedItems
-        {
-            get
-            {
-                List<string> list = new List<string>();
-                foreach(var item in checkedListBox.CheckedItems )
-                {
-                    list.Add(item.ToString());
-                }    
-                return list;
-            }
-            set
-            {
-                if (checkedListBox.Items.Contains(value))
-                {
-                    checkedListBox.SetItemCheckState(checkedListBox.Items.IndexOf(value), CheckState.Checked);
-                }
-            }
-        }
         public UserControlCheckedList()
         {
             InitializeComponent();
@@ -78,22 +45,24 @@ namespace Components
         public void ClearCheckedListBoxValues()
         {
             checkedListBox.Items.Clear();
+            _lastCheckedIndexes.Clear();
         }
         private void checkedListBox_ItemCheck(object sender, ItemCheckEventArgs e)
         {
-            if (checkedListBox.CheckedItems.Count > MaxCheckedItemsCount)
+            if (e.NewValue == CheckState.Checked)
             {
-                if (typeOfMaxChecked == Types.Exception)
+                _lastCheckedIndexes.Add(e.Index);
+
+                while (_lastCheckedIndexes.Count > MaxCheckedItemsCount)
                 {
-                    checkedListBox.SetItemChecked(e.Index, false);
+                    checkedListBox.SetItemCheckState(_lastCheckedIndexes[0], CheckState.Unchecked);
-                    throw new MaxCheckedItemsCountExceedException("Превышено максимальное число выбранных элементов");
                 }
-                else if (typeOfMaxChecked == Types.DeleteFirst)
-                {
-                    checkedListBox.SetItemChecked(0, false);
-                }
-                
             }
+            else if (e.NewValue == CheckState.Unchecked)
+            {
+                _lastCheckedIndexes.Remove(e.Index);
+            }
+
             _onCheckedItemChangedEvent?.Invoke(sender, e);
         }
     }