Sync active CollectionBox list selection with selected CollectionBox in workspace

Author: MaximDude

Editor/GUIEditorApp.cpp

@@ -214,6 +214,24 @@ namespace RTEGUI {
 		m_EditorBase->SetFocus();
 	}
 
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+	void GUIEditorApp::SelectActiveControlInList() const {
+		if (m_SelectionInfo.Control == nullptr) {
+			m_CollectionBoxList->SetSelectedIndex(-1);
+			return;
+		}
+		// Check if this is selected in the editor, and if so, select it in the list too
+		if (m_SelectionInfo.Control->GetID() == "COLLECTIONBOX") {
+			for (const GUIListBox::Item *listEntry : *m_CollectionBoxList->GetItemList()) {
+				if (listEntry->m_Name == m_SelectionInfo.Control->GetName()) {
+					m_CollectionBoxList->SetSelectedIndex(listEntry->m_ID);
+				}
+			}
+			if (!m_SelectionInfo.Control->GetChildren()->empty()) { PopulateCollectionBoxChildrenList(dynamic_cast<GUICollectionBox *>(m_SelectionInfo.Control)); }
+		}
+	}
+
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	void GUIEditorApp::AddItemToCollectionBoxList(GUIControl *control, const std::string &indent) const {
@@ -242,11 +260,6 @@ namespace RTEGUI {
 						AddItemToCollectionBoxList(collectionBox, "\t");
 					}
 				}
-				// Check if this is selected in the editor, and if so, select it in the list too
-				if (m_SelectionInfo.Control == collectionBox) {
-					m_CollectionBoxList->SetSelectedIndex(m_CollectionBoxList->GetItemList()->size() - 1);
-					PopulateCollectionBoxChildrenList(collectionBox);
-				}
 			}
 		}
 	}
@@ -593,13 +606,16 @@ namespace RTEGUI {
 				m_SelectionInfo.ClickY = mousePosY;
 
 				UpdateControlProperties(m_SelectionInfo.Control, false);
+
+				SelectActiveControlInList();
 			} else if (control == m_RootControl) {
 				// Unselect control
 				m_SelectionInfo.GrabbedControl = false;
 				m_SelectionInfo.GrabbedHandle = false;
 				m_SelectionInfo.Control = nullptr;
 
 				m_PropertyPage->ClearValues();
+				SelectActiveControlInList();
 			}
 		}
 	}

Editor/GUIEditorApp.h

@@ -168,6 +168,11 @@ namespace RTEGUI {
 		/// </summary>
 		void PopulateCollectionBoxChildrenList(GUICollectionBox *collectionBox) const;
 
+		/// <summary>
+		/// 
+		/// </summary>
+		void SelectActiveControlInList() const;
+
 		/// <summary>
 		/// Checks if a control is under the mouse point.
 		/// </summary>