Changes to control property updates

Author: MaximDude

Editor/EditorApp.cpp

@@ -55,10 +55,9 @@ namespace RTEGUI {
 
 	void EditorApp::ProcessMouseInput() {
 		std::array<int, 3> mouseButtons;
-		std::array<int, 3> mouseStates;
 		int mousePosX;
 		int mousePosY;
-		m_Input->GetMouseButtons(mouseButtons.data(), mouseStates.data());
+		m_Input->GetMouseButtons(mouseButtons.data(), nullptr);
 		m_Input->GetMousePosition(&mousePosX, &mousePosY);
 
 		EditorSelection &currentSelection = m_EditorManager->GetCurrentSelection();
@@ -132,11 +131,6 @@ namespace RTEGUI {
 
 			if (m_KeyStates.at(KEY_ALT) && m_KeyStates.at(KEY_F4)) { OnQuitButton(); }
 
-			if (m_EditorManager->GetPropertyPage()->HasTextFocus() && (m_KeyStates.at(KEY_ENTER) == pressed || m_KeyStates.at(KEY_ENTER_PAD) == pressed)) {
-				//m_EditorManager->UpdateControlProperties(m_EditorManager->GetCurrentSelection().GetControl());
-				m_UnsavedChanges = m_EditorManager->UpdatePropertyPage();
-			}
-
 			// Escape key - Undo any grab
 			if (m_KeyStates.at(KEY_ESC) == pressed) { m_EditorManager->ClearCurrentSelection(); }
 
@@ -208,8 +202,8 @@ namespace RTEGUI {
 					}
 					break;
 				case GUIEvent::Notification:
-					if (controlName == "PropertyPage") {
-						m_UnsavedChanges = m_EditorManager->UpdatePropertyPage(editorEvent);
+					if (controlName == "PropertyPage" && editorEvent.GetMsg() == GUIPropertyPage::Enter) {
+						m_UnsavedChanges = m_EditorManager->UpdateControlProperties(m_EditorManager->GetCurrentSelection().GetControl(), true);
 					} else if (controlName == "CollectionBoxList" && editorEvent.GetMsg() == GUIListBox::MouseDown) {
 						m_EditorManager->SelectActiveControlFromParentList();
 					} else if (controlName == "ControlsInCollectionBoxList" && editorEvent.GetMsg() == GUIListBox::MouseDown) {

Editor/EditorManager.cpp

@@ -423,32 +423,22 @@ namespace RTEGUI {
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-	bool EditorManager::UpdateControlProperties(GUIControl *control) const {
-		control->StoreProperties();
-
-		GUIProperties properties;
-		properties.Update(control->GetProperties(), true);
-		control->GetPanel()->BuildProperties(&properties);
-		m_PropertyPage->SetPropertyValues(&properties);
-
-		return true;
-	}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-	bool EditorManager::UpdatePropertyPage(GUIEvent &editorEvent) const {
+	bool EditorManager::UpdateControlProperties(GUIControl *control, bool manualEdit) const {
 		bool result = false;
-		if (editorEvent.GetMsg() == GUIPropertyPage::Enter) {
-			// Update the focused control properties
-			GUIControl *control = s_SelectionInfo.GetControl();
-			if (control) { control->ApplyProperties(m_PropertyPage->GetPropertyValues()); }
-			result = true;
-			RemoveFocus();
-		}
-		if (editorEvent.GetMsg() == GUIPropertyPage::Changed) {
-			// The properties are dirty and need to be updated
-			result = true;
+		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;
+			}
 		}
+		RemoveFocus();
 		return result;
 	}
 }

Editor/EditorManager.h

@@ -246,14 +246,9 @@ namespace RTEGUI {
 		/// <summary>
 		/// Updates the properties of an element in the workspace.
 		/// </summary>
-		/// <param name="control">The element to update properties for.</param>
-		bool UpdateControlProperties(GUIControl *control) const;
-
-		/// <summary>
-		/// Updates the property page in the left column with all the properties of the currently selected element.
-		/// </summary>
-		/// <param name="editorEvent">The editor event to get update info from.</param>
-		bool UpdatePropertyPage(GUIEvent &editorEvent) const;
+		/// <param name"control">The control to update properties for.</param>
+		/// <param name="manualEdit">Whether this update was triggered by manually editing values in the property page and pressing Enter.</param>
+		bool UpdateControlProperties(GUIControl *control, bool manualEdit = false) const;
 #pragma endregion
 
 	private: