Merge pull request libRocket#63 from viciious/warsow10_features

Warsow 1.0 features
blunted2night · Aug 23, 2012 · b8fe552 · b8fe552
2 parents d21317a + e2ae51a
commit b8fe552
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/Include/Rocket/Controls/ElementDataGridRow.h b/Include/Rocket/Controls/ElementDataGridRow.h
@@ -121,6 +121,8 @@ friend class ElementDataGrid;
 	// If the num_rows_removed parameter is left as the -1 default, it'll
 	// default to the rest of the children after the first row.
 	void RemoveChildren(int first_row_removed = 0, int num_rows_removed = -1);
+	// Marks children as dirty and dispatches the event.
+	void ChangeChildren(int first_row_changed = 0, int num_rows_changed = -1);
 	// Returns the number of rows under this row (children, grandchildren, etc)
 	int GetNumDescendants();
 

diff --git a/Source/Controls/ElementDataGridRow.cpp b/Source/Controls/ElementDataGridRow.cpp
@@ -268,10 +268,7 @@ void ElementDataGridRow::OnRowRemove(DataSource* _data_source, const Rocket::Cor
 void ElementDataGridRow::OnRowChange(DataSource* _data_source, const Rocket::Core::String& _data_table, int first_row_changed, int num_rows_changed)
 {
 	if (_data_source == data_source && _data_table == data_table)
-	{
-		for (int i = first_row_changed; i < first_row_changed + num_rows_changed; i++)
-			children[i]->DirtyCells();
-	}
+		ChangeChildren(first_row_changed, num_rows_changed);
 }
 
 void ElementDataGridRow::OnRowChange(DataSource* _data_source, const Rocket::Core::String& _data_table)
@@ -428,6 +425,17 @@ void ElementDataGridRow::RemoveChildren(int first_row_removed, int num_rows_remo
 	parent_grid->DispatchEvent("rowremove", parameters);
 }
 
+void ElementDataGridRow::ChangeChildren(int first_row_changed, int num_rows_changed)
+{
+	for (int i = first_row_changed; i < first_row_changed + num_rows_changed; i++)
+		children[i]->DirtyCells();
+
+	Rocket::Core::Dictionary parameters;
+	parameters.Set("first_row_changed", GetChildTableRelativeIndex(first_row_changed));
+	parameters.Set("num_rows_changed", num_rows_changed);
+	parent_grid->DispatchEvent("rowchange", parameters);
+}
+
 // Returns the number of rows under this row (children, grandchildren, etc)
 int ElementDataGridRow::GetNumDescendants()
 {

diff --git a/Source/Controls/WidgetTextInput.cpp b/Source/Controls/WidgetTextInput.cpp
@@ -234,10 +234,11 @@ Core::Element* WidgetTextInput::GetElement()
 }
 
 // Dispatches a change event to the widget's element.
-void WidgetTextInput::DispatchChangeEvent()
+void WidgetTextInput::DispatchChangeEvent(bool linebreak)
 {
 	Rocket::Core::Dictionary parameters;
 	parameters.Set("value", GetElement()->GetAttribute< Rocket::Core::String >("value", ""));
+	parameters.Set("linebreak", linebreak);
 	GetElement()->DispatchEvent("change", parameters);
 }
 

diff --git a/Source/Controls/WidgetTextInput.h b/Source/Controls/WidgetTextInput.h
@@ -109,7 +109,7 @@ class WidgetTextInput : public Core::EventListener
 	Core::Element* GetElement();
 
 	/// Dispatches a change event to the widget's element.
-	void DispatchChangeEvent();
+	void DispatchChangeEvent(bool linebreak = false);
 
 private:
 	/// Moves the cursor along the current line.

diff --git a/Source/Controls/WidgetTextInputSingleLine.cpp b/Source/Controls/WidgetTextInputSingleLine.cpp
@@ -58,7 +58,7 @@ bool WidgetTextInputSingleLine::IsCharacterValid(Rocket::Core::word character)
 // Called when the user pressed enter.
 void WidgetTextInputSingleLine::LineBreak()
 {
-	DispatchChangeEvent();
+	DispatchChangeEvent(true);
 }
 
 // Strips all \n and \r characters from the string.