More fixes to lists

Author: MaximDude

Editor/EditorApp.cpp

@@ -210,6 +210,8 @@ namespace RTEGUI {
 				case GUIEvent::Notification:
 					if (controlName == "PropertyPage" && editorEvent.GetMsg() == GUIPropertyPage::Enter) {
 						m_UnsavedChanges = m_EditorManager->UpdateControlProperties(m_EditorManager->GetCurrentSelection().GetControl(), true);
+						m_EditorManager->UpdateCollectionBoxList();
+						m_EditorManager->UpdateCollectionBoxChildrenList(dynamic_cast<GUICollectionBox *>(m_EditorManager->GetCurrentSelection().GetControl()));
 					} else if (controlName == "CollectionBoxList" && editorEvent.GetMsg() == GUIListBox::MouseDown) {
 						m_EditorManager->SelectActiveControlFromParentList();
 					} else if (controlName == "ControlsInCollectionBoxList" && editorEvent.GetMsg() == GUIListBox::MouseDown) {

Editor/EditorManager.cpp

@@ -153,24 +153,6 @@ namespace RTEGUI {
 		dynamic_cast<GUILabel *>(m_EditorControlManager->GetControl("FrameTimer"))->SetText("Frame Time: " + std::to_string(frameTime) + "ms");
 	}
 
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-	void EditorManager::StoreCurrentSelectionCopyInfo() const {
-		GUIControl *selectedControl = s_SelectionInfo.GetControl();
-		if (selectedControl) {
-			s_SelectionCopyInfo = {
-				selectedControl->GetName(),
-				selectedControl->GetID(),
-				selectedControl->GetPanel()->GetRelXPos(),
-				selectedControl->GetPanel()->GetRelYPos(),
-				selectedControl->GetPanel()->GetWidth(),
-				selectedControl->GetPanel()->GetHeight(),
-				selectedControl->GetParent(),
-				selectedControl->GetProperties()
-			};
-		}
-	}
-
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	bool EditorManager::AddNewControl(GUIEvent &editorEvent) {
@@ -298,6 +280,7 @@ namespace RTEGUI {
 					s_SelectionInfo.SetControl(control);
 				}
 				UpdateCollectionBoxChildrenList(dynamic_cast<GUICollectionBox *>(control));
+				UpdateControlProperties(s_SelectionInfo.GetControl());
 			}
 		} else {
 			// Deselection if clicked on no list item
@@ -318,6 +301,7 @@ namespace RTEGUI {
 			if (control) {
 				s_SelectionInfo.ReleaseAnyGrabs();
 				s_SelectionInfo.SetControl(control);
+				UpdateControlProperties(s_SelectionInfo.GetControl());
 			}
 		} else {
 			// Deselection if clicked on no list item
@@ -388,6 +372,9 @@ namespace RTEGUI {
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	void EditorManager::UpdateCollectionBoxChildrenList(GUICollectionBox *collectionBox) const {
+		if (!collectionBox) {
+			return;
+		}
 		m_ControlsInCollectionBoxList->ClearList();
 
 		// Go through all the top-level (directly under root) controls and add only the CollectionBoxes to the list here
@@ -470,6 +457,24 @@ namespace RTEGUI {
 		RemoveFocus();
 	}
 
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+	void EditorManager::StoreCurrentSelectionCopyInfo() const {
+		GUIControl *selectedControl = s_SelectionInfo.GetControl();
+		if (selectedControl) {
+			s_SelectionCopyInfo = {
+				selectedControl->GetName(),
+				selectedControl->GetID(),
+				selectedControl->GetPanel()->GetRelXPos(),
+				selectedControl->GetPanel()->GetRelYPos(),
+				selectedControl->GetPanel()->GetWidth(),
+				selectedControl->GetPanel()->GetHeight(),
+				selectedControl->GetParent(),
+				selectedControl->GetProperties()
+			};
+		}
+	}
+
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	void EditorManager::UpdateSnapGridSize(GUIEvent &editorEvent) const {
@@ -494,17 +499,13 @@ namespace RTEGUI {
 	bool EditorManager::UpdateControlProperties(GUIControl *control, bool manualEdit) const {
 		bool result = false;
 		if (control) {
-			if (manualEdit) {
-				control->ApplyProperties(m_PropertyPage->GetPropertyValues());
-				result = true;
-			} else {
-				control->StoreProperties();
-				GUIProperties properties;
-				properties.Update(control->GetProperties(), true);
-				control->GetPanel()->BuildProperties(&properties);
-				m_PropertyPage->SetPropertyValues(&properties);
-				result = true;
-			}
+			if (manualEdit) { control->ApplyProperties(m_PropertyPage->GetPropertyValues()); }
+			control->StoreProperties();
+			GUIProperties properties;
+			properties.Update(control->GetProperties(), true);
+			control->GetPanel()->BuildProperties(&properties);
+			m_PropertyPage->SetPropertyValues(&properties);
+			result = true;
 		}
 		RemoveFocus();
 		return result;

Editor/EditorManager.h

@@ -142,11 +142,6 @@ namespace RTEGUI {
 #pragma endregion
 
 #pragma region GUI Element Creation
-		/// <summary>
-		/// Stores the properties of the currently selected GUI element in the workspace for later recreation.
-		/// </summary>
-		void StoreCurrentSelectionCopyInfo() const;
-
 		/// <summary>
 		/// Create a new GUI element in the workspace.
 		/// </summary>
@@ -244,6 +239,11 @@ namespace RTEGUI {
 		/// Clears the current selection, the selection in the CollectionBoxList and clears the ControlsInCollectionBoxList and property page.
 		/// </summary>
 		void ClearCurrentSelection() const;
+
+		/// <summary>
+		/// Stores the properties of the currently selected GUI element in the workspace for later recreation.
+		/// </summary>
+		void StoreCurrentSelectionCopyInfo() const;
 #pragma endregion
 
 #pragma region Updates