Layout change does not always require text widget formatting, be more restrictive for perfomance reasons

Source/Core/Elements/ElementFormControlTextArea.cpp

@@ -27,10 +27,11 @@
  */
 
 #include "../../../Include/RmlUi/Core/Elements/ElementFormControlTextArea.h"
-#include "../../../Include/RmlUi/Core/Math.h"
-#include "../../../Include/RmlUi/Core/ElementUtilities.h"
 #include "../../../Include/RmlUi/Core/ElementText.h"
+#include "../../../Include/RmlUi/Core/ElementUtilities.h"
+#include "../../../Include/RmlUi/Core/Math.h"
 #include "../../../Include/RmlUi/Core/PropertyIdSet.h"
+#include "../../../Include/RmlUi/Core/StyleSheetSpecification.h"
 #include "WidgetTextInputMultiLine.h"
 
 namespace Rml {
@@ -181,8 +182,14 @@ void ElementFormControlTextArea::OnPropertyChange(const PropertyIdSet& changed_p
 {
 	ElementFormControl::OnPropertyChange(changed_properties);
 
-	if (changed_properties.Contains(PropertyId::Color) ||
-		changed_properties.Contains(PropertyId::BackgroundColor))
+	// Some inherited properties require text formatting update, mainly font and line-height properties.
+	const PropertyIdSet changed_inherited_layout_properties = changed_properties &
+		(StyleSheetSpecification::GetRegisteredInheritedProperties() & StyleSheetSpecification::GetRegisteredPropertiesForcingLayout());
+
+	if (!changed_inherited_layout_properties.Empty())
+		widget->ForceFormattingOnNextLayout();
+
+	if (changed_properties.Contains(PropertyId::Color) || changed_properties.Contains(PropertyId::BackgroundColor))
 		widget->UpdateSelectionColours();
 
 	if (changed_properties.Contains(PropertyId::CaretColor))

Source/Core/Elements/InputTypeText.cpp

@@ -28,10 +28,11 @@
 
 #include "InputTypeText.h"
 #include "../../../Include/RmlUi/Core/ElementUtilities.h"
-#include "WidgetTextInputSingleLine.h"
-#include "WidgetTextInputSingleLinePassword.h"
 #include "../../../Include/RmlUi/Core/Elements/ElementFormControlInput.h"
 #include "../../../Include/RmlUi/Core/PropertyIdSet.h"
+#include "../../../Include/RmlUi/Core/StyleSheetSpecification.h"
+#include "WidgetTextInputSingleLine.h"
+#include "WidgetTextInputSingleLinePassword.h"
 
 namespace Rml {
 
@@ -96,8 +97,14 @@ bool InputTypeText::OnAttributeChange(const ElementAttributes& changed_attribute
 // Called when properties on the control are changed.
 void InputTypeText::OnPropertyChange(const PropertyIdSet& changed_properties)
 {
-	if (changed_properties.Contains(PropertyId::Color) ||
-		changed_properties.Contains(PropertyId::BackgroundColor))
+	// Some inherited properties require text formatting update, mainly font and line-height properties.
+	const PropertyIdSet changed_inherited_layout_properties = changed_properties &
+		(StyleSheetSpecification::GetRegisteredInheritedProperties() & StyleSheetSpecification::GetRegisteredPropertiesForcingLayout());
+
+	if (!changed_inherited_layout_properties.Empty())
+		widget->ForceFormattingOnNextLayout();
+
+	if (changed_properties.Contains(PropertyId::Color) || changed_properties.Contains(PropertyId::BackgroundColor))
 		widget->UpdateSelectionColours();
 
 	if (changed_properties.Contains(PropertyId::CaretColor))

Source/Core/Elements/WidgetTextInput.cpp

@@ -106,6 +106,7 @@ WidgetTextInput::WidgetTextInput(ElementFormControl* _parent) : internal_dimensi
 	cursor_wrap_down = false;
 	ideal_cursor_position_to_the_right_of_cursor = true;
 	cancel_next_drag = false;
+	force_formatting_on_next_layout = false;
 
 	ideal_cursor_position = 0;
 
@@ -259,6 +260,8 @@ void WidgetTextInput::OnResize()
 	Vector2f text_position = parent->GetBox().GetPosition(Box::CONTENT);
 	text_element->SetOffset(text_position, parent);
 	selected_text_element->SetOffset(text_position, parent);
+
+	ForceFormattingOnNextLayout();
 }
 
 // Renders the cursor, if it is visible.
@@ -279,31 +282,18 @@ void WidgetTextInput::OnRender()
 // Formats the widget's internal content.
 void WidgetTextInput::OnLayout()
 {
-	FormatElement();
-
-	Vector2f new_internal_dimensions = parent->GetBox().GetSize(Box::CONTENT);
-	if (new_internal_dimensions != internal_dimensions)
+	if (force_formatting_on_next_layout)
 	{
-		internal_dimensions = new_internal_dimensions;
+		internal_dimensions = parent->GetBox().GetSize(Box::CONTENT);
+		FormatElement();
 		UpdateCursorPosition(true);
+		force_formatting_on_next_layout = false;
 	}
 
 	parent->SetScrollLeft(scroll_offset.x);
 	parent->SetScrollTop(scroll_offset.y);
 }
 
-// Returns the input element's underlying text element.
-ElementText* WidgetTextInput::GetTextElement()
-{
-	return text_element;
-}
-
-// Returns the input element's maximum allowed text dimensions.
-Vector2f WidgetTextInput::GetTextDimensions() const
-{
-	return internal_dimensions;
-}
-
 // Gets the parent element containing the widget.
 Element* WidgetTextInput::GetElement() const
 {
@@ -1159,6 +1149,11 @@ void WidgetTextInput::GenerateCursor()
 	GeometryUtilities::GenerateQuad(&vertices[0], &indices[0], Vector2f(0, 0), cursor_size, color);
 }
 
+void WidgetTextInput::ForceFormattingOnNextLayout()
+{
+	force_formatting_on_next_layout = true;
+}
+
 void WidgetTextInput::UpdateCursorPosition(bool update_ideal_cursor_position)
 {
 	if (text_element->GetFontFaceHandle() == 0)

Source/Core/Elements/WidgetTextInput.h

@@ -32,6 +32,7 @@
 #include "../../../Include/RmlUi/Core/EventListener.h"
 #include "../../../Include/RmlUi/Core/Geometry.h"
 #include "../../../Include/RmlUi/Core/Vertex.h"
+#include <float.h>
 
 namespace Rml {
 
@@ -68,6 +69,8 @@ public:
 	void UpdateSelectionColours();
 	/// Generates the text cursor.
 	void GenerateCursor();
+	/// Force text formatting on the next layout update.
+	void ForceFormattingOnNextLayout();
 
 	/// Updates the cursor, if necessary.
 	void OnUpdate();
@@ -78,11 +81,6 @@ public:
 	/// Called when the parent element's size changes.
 	void OnResize();
 
-	/// Returns the input element's underlying text element.
-	ElementText* GetTextElement();
-	/// Returns the input element's maximum allowed text dimensions.
-	Vector2f GetTextDimensions() const;
-
 protected:
 	enum class CursorMovement { Begin = -4, BeginLine = -3, PreviousWord = -2, Left = -1, Right = 1, NextWord = 2, EndLine = 3, End = 4 };
 
@@ -216,6 +214,7 @@ private:
 
 	bool ideal_cursor_position_to_the_right_of_cursor;
 	bool cancel_next_drag;
+	bool force_formatting_on_next_layout;
 
 	// Selection. The start and end indices of the selection are in absolute coordinates.
 	Element* selection_element;