WinControl: activate duplicated form

2mik · Jul 23, 2024 · 50a43f6 · 50a43f6
1 parent 9be25a3
commit 50a43f6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/Src/WinControl/WinControl/WinControl.cs b/Src/WinControl/WinControl/WinControl.cs
@@ -81,23 +81,14 @@ public Form ActiveForm
         }
 
         /// <summary>
-        /// Gets the list of forms contained within the control.
-        /// <para>Получить список форм, которые содержит элемент управления.</para>
+        /// Gets the enumerator of forms contained within the control.
+        /// <para>Получить перечисление форм, которые содержит элемент управления.</para>
         /// </summary>
-        public List<Form> Forms
+        public IEnumerable<Form> Forms
         {
             get
             {
-                List<Form> forms = new(tabPageList.Count);
-
-                foreach (TabPage tabPage in tabPageList)
-                {
-                    Form form = tabPage.ChildForm;
-                    if (form != null)
-                        forms.Add(form);
-                }
-
-                return forms;
+                return tabPageList.Where(t => t.ChildForm != null).Select(t => t.ChildForm);
             }
         }
 
@@ -664,8 +655,13 @@ protected void OnChildFormModifiedChanged(ChildFormEventArgs e)
         /// </summary>
         public void AddForm(Form form, string hint, Image image, TreeNode treeNode)
         {
-            // tests the form for duplicating
-            // проверка дублирования формы
+            // activate the form if it is already added
+            if (FindTabPage(form) is TabPage existingTabPage)
+            {
+                SelectTabPage(existingTabPage);
+                return;
+            }
+
             foreach (TabPage tab in tabPageList)
             {
                 if (tab.ChildForm != null && tab.ChildForm == form)

diff --git a/Src/WinControl/WinControl/WinControl.csproj b/Src/WinControl/WinControl/WinControl.csproj
@@ -8,7 +8,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>WinControls</RootNamespace>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <Version>2.2.0</Version>
+    <Version>2.2.1</Version>
     <Authors>Mikhail Shiryaev</Authors>
     <Company />
     <PackageProjectUrl></PackageProjectUrl>