Make decorator list and font effect list use const pointers.

Include/RmlUi/Core/Decorator.h

@@ -59,15 +59,15 @@ public:
 	/// Called on a decorator to generate any required per-element data for a newly decorated element.
 	/// @param[in] element The newly decorated element.
 	/// @return A handle to a decorator-defined data handle, or NULL if none is needed for the element.
-	virtual DecoratorDataHandle GenerateElementData(Element* element) = 0;
+	virtual DecoratorDataHandle GenerateElementData(Element* element) const = 0;
 	/// Called to release element data generated by this decorator.
 	/// @param[in] element_data The element data handle to release.
-	virtual void ReleaseElementData(DecoratorDataHandle element_data) = 0;
+	virtual void ReleaseElementData(DecoratorDataHandle element_data) const = 0;
 
 	/// Called to render the decorator on an element.
 	/// @param[in] element The element to render the decorator on.
 	/// @param[in] element_data The handle to the data generated by the decorator for the element.
-	virtual void RenderElement(Element* element, DecoratorDataHandle element_data) = 0;
+	virtual void RenderElement(Element* element, DecoratorDataHandle element_data) const = 0;
 
 	/// Value specifying an invalid or non-existent Decorator data handle.
 	static const DecoratorDataHandle INVALID_DECORATORDATAHANDLE = 0;

Include/RmlUi/Core/Types.h

@@ -147,8 +147,8 @@ typedef std::shared_ptr< Transform > TransformRef;
 struct Transition;
 struct TransitionList;
 
-using DecoratorList = std::vector<std::shared_ptr<Decorator>>;
-using FontEffectList = std::vector<std::shared_ptr<FontEffect>>;
+using DecoratorList = std::vector<std::shared_ptr<const Decorator>>;
+using FontEffectList = std::vector<std::shared_ptr<const FontEffect>>;
 using AnimationList = std::vector<Animation>;
 
 }

Samples/invaders/src/DecoratorDefender.cpp

@@ -48,7 +48,7 @@ bool DecoratorDefender::Initialise(const Rml::Core::String& image_source, const
 }
 
 /// Called on a decorator to generate any required per-element data for a newly decorated element.
-Rml::Core::DecoratorDataHandle DecoratorDefender::GenerateElementData(Rml::Core::Element* RMLUI_UNUSED_PARAMETER(element))
+Rml::Core::DecoratorDataHandle DecoratorDefender::GenerateElementData(Rml::Core::Element* RMLUI_UNUSED_PARAMETER(element)) const
 {
 	RMLUI_UNUSED(element);
 
@@ -56,13 +56,13 @@ Rml::Core::DecoratorDataHandle DecoratorDefender::GenerateElementData(Rml::Core:
 }
 
 // Called to release element data generated by this decorator.
-void DecoratorDefender::ReleaseElementData(Rml::Core::DecoratorDataHandle RMLUI_UNUSED_PARAMETER(element_data))
+void DecoratorDefender::ReleaseElementData(Rml::Core::DecoratorDataHandle RMLUI_UNUSED_PARAMETER(element_data)) const
 {
 	RMLUI_UNUSED(element_data);
 }
 
 // Called to render the decorator on an element.
-void DecoratorDefender::RenderElement(Rml::Core::Element* element, Rml::Core::DecoratorDataHandle RMLUI_UNUSED_PARAMETER(element_data))
+void DecoratorDefender::RenderElement(Rml::Core::Element* element, Rml::Core::DecoratorDataHandle RMLUI_UNUSED_PARAMETER(element_data)) const
 {
 	RMLUI_UNUSED(element_data);
 

Samples/invaders/src/DecoratorDefender.h

@@ -41,15 +41,15 @@ public:
 	/// Called on a decorator to generate any required per-element data for a newly decorated element.
 	/// @param element[in] The newly decorated element.
 	/// @return A handle to a decorator-defined data handle, or NULL if none is needed for the element.
-	virtual Rml::Core::DecoratorDataHandle GenerateElementData(Rml::Core::Element* element);
+	Rml::Core::DecoratorDataHandle GenerateElementData(Rml::Core::Element* element) const override;
 	/// Called to release element data generated by this decorator.
 	/// @param element_data[in] The element data handle to release.
-	virtual void ReleaseElementData(Rml::Core::DecoratorDataHandle element_data);
+	void ReleaseElementData(Rml::Core::DecoratorDataHandle element_data) const override;
 
 	/// Called to render the decorator on an element.
 	/// @param element[in] The element to render the decorator on.
 	/// @param element_data[in] The handle to the data generated by the decorator for the element.
-	virtual void RenderElement(Rml::Core::Element* element, Rml::Core::DecoratorDataHandle element_data);
+	void RenderElement(Rml::Core::Element* element, Rml::Core::DecoratorDataHandle element_data) const override;
 
 private:
 	int image_index;

Samples/invaders/src/DecoratorStarfield.cpp

@@ -53,7 +53,7 @@ bool DecoratorStarfield::Initialise(int _num_layers, const Rml::Core::Colourb& _
 }
 
 /// Called on a decorator to generate any required per-element data for a newly decorated element.
-Rml::Core::DecoratorDataHandle DecoratorStarfield::GenerateElementData(Rml::Core::Element* element)
+Rml::Core::DecoratorDataHandle DecoratorStarfield::GenerateElementData(Rml::Core::Element* element) const
 {
 	StarField* star_field = new StarField();
 
@@ -90,13 +90,13 @@ Rml::Core::DecoratorDataHandle DecoratorStarfield::GenerateElementData(Rml::Core
 }
 
 // Called to release element data generated by this decorator.
-void DecoratorStarfield::ReleaseElementData(Rml::Core::DecoratorDataHandle element_data)
+void DecoratorStarfield::ReleaseElementData(Rml::Core::DecoratorDataHandle element_data) const
 {
 	delete reinterpret_cast<StarField*>(element_data);
 }
 
 // Called to render the decorator on an element.
-void DecoratorStarfield::RenderElement(Rml::Core::Element* RMLUI_UNUSED_PARAMETER(element), Rml::Core::DecoratorDataHandle element_data)
+void DecoratorStarfield::RenderElement(Rml::Core::Element* RMLUI_UNUSED_PARAMETER(element), Rml::Core::DecoratorDataHandle element_data) const
 {
 	RMLUI_UNUSED(element);
 

Samples/invaders/src/DecoratorStarfield.h

@@ -42,15 +42,15 @@ public:
 	/// Called on a decorator to generate any required per-element data for a newly decorated element.
 	/// @param[in] element The newly decorated element.
 	/// @return A handle to a decorator-defined data handle, or NULL if none is needed for the element.
-	virtual Rml::Core::DecoratorDataHandle GenerateElementData(Rml::Core::Element* element);
+	Rml::Core::DecoratorDataHandle GenerateElementData(Rml::Core::Element* element) const override;
 	/// Called to release element data generated by this decorator.
 	/// @param[in] element_data The element data handle to release.
-	virtual void ReleaseElementData(Rml::Core::DecoratorDataHandle element_data);
+	void ReleaseElementData(Rml::Core::DecoratorDataHandle element_data) const override;
 
 	/// Called to render the decorator on an element.
 	/// @param[in] element The element to render the decorator on.
 	/// @param[in] element_data The handle to the data generated by the decorator for the element.
-	virtual void RenderElement(Rml::Core::Element* element, Rml::Core::DecoratorDataHandle element_data);
+	void RenderElement(Rml::Core::Element* element, Rml::Core::DecoratorDataHandle element_data) const override;
 
 private:
 	int num_layers;

Samples/luainvaders/src/DecoratorDefender.cpp

@@ -48,7 +48,7 @@ bool DecoratorDefender::Initialise(const Rml::Core::String& image_source, const
 }
 
 /// Called on a decorator to generate any required per-element data for a newly decorated element.
-Rml::Core::DecoratorDataHandle DecoratorDefender::GenerateElementData(Rml::Core::Element* RMLUI_UNUSED_PARAMETER(element))
+Rml::Core::DecoratorDataHandle DecoratorDefender::GenerateElementData(Rml::Core::Element* RMLUI_UNUSED_PARAMETER(element)) const
 {
 	RMLUI_UNUSED(element);
 
@@ -56,13 +56,13 @@ Rml::Core::DecoratorDataHandle DecoratorDefender::GenerateElementData(Rml::Core:
 }
 
 // Called to release element data generated by this decorator.
-void DecoratorDefender::ReleaseElementData(Rml::Core::DecoratorDataHandle RMLUI_UNUSED_PARAMETER(element_data))
+void DecoratorDefender::ReleaseElementData(Rml::Core::DecoratorDataHandle RMLUI_UNUSED_PARAMETER(element_data)) const
 {
 	RMLUI_UNUSED(element_data);
 }
 
 // Called to render the decorator on an element.
-void DecoratorDefender::RenderElement(Rml::Core::Element* element, Rml::Core::DecoratorDataHandle RMLUI_UNUSED_PARAMETER(element_data))
+void DecoratorDefender::RenderElement(Rml::Core::Element* element, Rml::Core::DecoratorDataHandle RMLUI_UNUSED_PARAMETER(element_data)) const
 {
 	RMLUI_UNUSED(element_data);
 

Samples/luainvaders/src/DecoratorDefender.h

@@ -41,15 +41,15 @@ public:
 	/// Called on a decorator to generate any required per-element data for a newly decorated element.
 	/// @param element[in] The newly decorated element.
 	/// @return A handle to a decorator-defined data handle, or NULL if none is needed for the element.
-	virtual Rml::Core::DecoratorDataHandle GenerateElementData(Rml::Core::Element* element);
+	Rml::Core::DecoratorDataHandle GenerateElementData(Rml::Core::Element* element) const override;
 	/// Called to release element data generated by this decorator.
 	/// @param element_data[in] The element data handle to release.
-	virtual void ReleaseElementData(Rml::Core::DecoratorDataHandle element_data);
+	void ReleaseElementData(Rml::Core::DecoratorDataHandle element_data) const override;
 
 	/// Called to render the decorator on an element.
 	/// @param element[in] The element to render the decorator on.
 	/// @param element_data[in] The handle to the data generated by the decorator for the element.
-	virtual void RenderElement(Rml::Core::Element* element, Rml::Core::DecoratorDataHandle element_data);
+	void RenderElement(Rml::Core::Element* element, Rml::Core::DecoratorDataHandle element_data) const override;
 
 private:
 	int image_index;

Samples/luainvaders/src/DecoratorStarfield.cpp

@@ -53,7 +53,7 @@ bool DecoratorStarfield::Initialise(int _num_layers, const Rml::Core::Colourb& _
 }
 
 /// Called on a decorator to generate any required per-element data for a newly decorated element.
-Rml::Core::DecoratorDataHandle DecoratorStarfield::GenerateElementData(Rml::Core::Element* element)
+Rml::Core::DecoratorDataHandle DecoratorStarfield::GenerateElementData(Rml::Core::Element* element) const
 {
 	StarField* star_field = new StarField();
 
@@ -90,13 +90,13 @@ Rml::Core::DecoratorDataHandle DecoratorStarfield::GenerateElementData(Rml::Core
 }
 
 // Called to release element data generated by this decorator.
-void DecoratorStarfield::ReleaseElementData(Rml::Core::DecoratorDataHandle element_data)
+void DecoratorStarfield::ReleaseElementData(Rml::Core::DecoratorDataHandle element_data) const
 {
 	delete (StarField*)element_data;
 }
 
 // Called to render the decorator on an element.
-void DecoratorStarfield::RenderElement(Rml::Core::Element* RMLUI_UNUSED_PARAMETER(element), Rml::Core::DecoratorDataHandle element_data)
+void DecoratorStarfield::RenderElement(Rml::Core::Element* RMLUI_UNUSED_PARAMETER(element), Rml::Core::DecoratorDataHandle element_data) const
 {
 	RMLUI_UNUSED(element);
 

Samples/luainvaders/src/DecoratorStarfield.h

@@ -42,15 +42,15 @@ public:
 	/// Called on a decorator to generate any required per-element data for a newly decorated element.
 	/// @param[in] element The newly decorated element.
 	/// @return A handle to a decorator-defined data handle, or NULL if none is needed for the element.
-	virtual Rml::Core::DecoratorDataHandle GenerateElementData(Rml::Core::Element* element);
+	Rml::Core::DecoratorDataHandle GenerateElementData(Rml::Core::Element* element) const override;
 	/// Called to release element data generated by this decorator.
 	/// @param[in] element_data The element data handle to release.
-	virtual void ReleaseElementData(Rml::Core::DecoratorDataHandle element_data);
+	void ReleaseElementData(Rml::Core::DecoratorDataHandle element_data) const override;
 
 	/// Called to render the decorator on an element.
 	/// @param[in] element The element to render the decorator on.
 	/// @param[in] element_data The handle to the data generated by the decorator for the element.
-	virtual void RenderElement(Rml::Core::Element* element, Rml::Core::DecoratorDataHandle element_data);
+	void RenderElement(Rml::Core::Element* element, Rml::Core::DecoratorDataHandle element_data) const override;
 
 private:
 	int num_layers;

Samples/tutorial/datagrid/src/DecoratorDefender.cpp

@@ -31,7 +31,7 @@ bool DecoratorDefender::Initialise(const Rml::Core::String& image_source, const
 }
 
 /// Called on a decorator to generate any required per-element data for a newly decorated element.
-Rml::Core::DecoratorDataHandle DecoratorDefender::GenerateElementData(Rml::Core::Element* RMLUI_UNUSED_PARAMETER(element))
+Rml::Core::DecoratorDataHandle DecoratorDefender::GenerateElementData(Rml::Core::Element* RMLUI_UNUSED_PARAMETER(element)) const
 {
 	RMLUI_UNUSED(element);
 
@@ -39,13 +39,13 @@ Rml::Core::DecoratorDataHandle DecoratorDefender::GenerateElementData(Rml::Core:
 }
 
 // Called to release element data generated by this decorator.
-void DecoratorDefender::ReleaseElementData(Rml::Core::DecoratorDataHandle RMLUI_UNUSED_PARAMETER(element_data))
+void DecoratorDefender::ReleaseElementData(Rml::Core::DecoratorDataHandle RMLUI_UNUSED_PARAMETER(element_data)) const
 {
 	RMLUI_UNUSED(element_data);
 }
 
 // Called to render the decorator on an element.
-void DecoratorDefender::RenderElement(Rml::Core::Element* element, Rml::Core::DecoratorDataHandle RMLUI_UNUSED_PARAMETER(element_data))
+void DecoratorDefender::RenderElement(Rml::Core::Element* element, Rml::Core::DecoratorDataHandle RMLUI_UNUSED_PARAMETER(element_data)) const
 {
 	RMLUI_UNUSED(element_data);
 

Samples/tutorial/datagrid/src/DecoratorDefender.h

@@ -29,15 +29,15 @@ public:
 	/// Called on a decorator to generate any required per-element data for a newly decorated element.
 	/// @param element[in] The newly decorated element.
 	/// @return A handle to a decorator-defined data handle, or NULL if none is needed for the element.
-	virtual Rml::Core::DecoratorDataHandle GenerateElementData(Rml::Core::Element* element);
+	Rml::Core::DecoratorDataHandle GenerateElementData(Rml::Core::Element* element) const override;
 	/// Called to release element data generated by this decorator.
 	/// @param element_data[in] The element data handle to release.
-	virtual void ReleaseElementData(Rml::Core::DecoratorDataHandle element_data);
+	void ReleaseElementData(Rml::Core::DecoratorDataHandle element_data) const override;
 
 	/// Called to render the decorator on an element.
 	/// @param element[in] The element to render the decorator on.
 	/// @param element_data[in] The handle to the data generated by the decorator for the element.
-	virtual void RenderElement(Rml::Core::Element* element, Rml::Core::DecoratorDataHandle element_data);
+	void RenderElement(Rml::Core::Element* element, Rml::Core::DecoratorDataHandle element_data) const override;
 
 private:
 	int image_index;

Samples/tutorial/datagrid_tree/src/DecoratorDefender.cpp

@@ -31,7 +31,7 @@ bool DecoratorDefender::Initialise(const Rml::Core::String& image_source, const
 }
 
 /// Called on a decorator to generate any required per-element data for a newly decorated element.
-Rml::Core::DecoratorDataHandle DecoratorDefender::GenerateElementData(Rml::Core::Element* RMLUI_UNUSED_PARAMETER(element))
+Rml::Core::DecoratorDataHandle DecoratorDefender::GenerateElementData(Rml::Core::Element* RMLUI_UNUSED_PARAMETER(element)) const
 {
 	RMLUI_UNUSED(element);
 
@@ -39,13 +39,13 @@ Rml::Core::DecoratorDataHandle DecoratorDefender::GenerateElementData(Rml::Core:
 }
 
 // Called to release element data generated by this decorator.
-void DecoratorDefender::ReleaseElementData(Rml::Core::DecoratorDataHandle RMLUI_UNUSED_PARAMETER(element_data))
+void DecoratorDefender::ReleaseElementData(Rml::Core::DecoratorDataHandle RMLUI_UNUSED_PARAMETER(element_data)) const
 {
 	RMLUI_UNUSED(element_data);
 }
 
 // Called to render the decorator on an element.
-void DecoratorDefender::RenderElement(Rml::Core::Element* element, Rml::Core::DecoratorDataHandle RMLUI_UNUSED_PARAMETER(element_data))
+void DecoratorDefender::RenderElement(Rml::Core::Element* element, Rml::Core::DecoratorDataHandle RMLUI_UNUSED_PARAMETER(element_data)) const
 {
 	RMLUI_UNUSED(element_data);
 

Samples/tutorial/datagrid_tree/src/DecoratorDefender.h

@@ -29,15 +29,15 @@ public:
 	/// Called on a decorator to generate any required per-element data for a newly decorated element.
 	/// @param element[in] The newly decorated element.
 	/// @return A handle to a decorator-defined data handle, or NULL if none is needed for the element.
-	virtual Rml::Core::DecoratorDataHandle GenerateElementData(Rml::Core::Element* element);
+	Rml::Core::DecoratorDataHandle GenerateElementData(Rml::Core::Element* element) const override;
 	/// Called to release element data generated by this decorator.
 	/// @param element_data[in] The element data handle to release.
-	virtual void ReleaseElementData(Rml::Core::DecoratorDataHandle element_data);
+	void ReleaseElementData(Rml::Core::DecoratorDataHandle element_data) const override;
 
 	/// Called to render the decorator on an element.
 	/// @param element[in] The element to render the decorator on.
 	/// @param element_data[in] The handle to the data generated by the decorator for the element.
-	virtual void RenderElement(Rml::Core::Element* element, Rml::Core::DecoratorDataHandle element_data);
+	void RenderElement(Rml::Core::Element* element, Rml::Core::DecoratorDataHandle element_data) const override;
 
 private:
 	int image_index;

Source/Core/BitmapFont/FontFaceLayer.cpp

@@ -45,7 +45,7 @@ FontFaceLayer::~FontFaceLayer()
 }
 
 // Generates the character and texture data for the layer.
-bool FontFaceLayer::Initialise(const Rml::Core::FontFaceHandle* _handle, std::shared_ptr<FontEffect> _effect, const Rml::Core::FontFaceLayer* clone, bool deep_clone)
+bool FontFaceLayer::Initialise(const Rml::Core::FontFaceHandle* _handle, std::shared_ptr<const FontEffect> _effect, const Rml::Core::FontFaceLayer* clone, bool deep_clone)
 {
 	(void)(_effect);
 

Source/Core/BitmapFont/FontFaceLayer.h

@@ -61,7 +61,7 @@ public:
 	/// @param[in] clone The layer to optionally clone geometry and texture data from.
 	/// @param[in] deep_clone If true, the clones geometry will be completely cloned and the effect will have no option to affect even the glyph origins.
 	/// @return True if the layer was generated successfully, false if not.
-	bool Initialise(const Rml::Core::FontFaceHandle* handle, std::shared_ptr<FontEffect> effect, const Rml::Core::FontFaceLayer* clone = NULL, bool deep_clone = false) override;
+	bool Initialise(const Rml::Core::FontFaceHandle* handle, std::shared_ptr<const FontEffect> effect, const Rml::Core::FontFaceLayer* clone = NULL, bool deep_clone = false) override;
 
 	/// Generates the texture data for a layer (for the texture database).
 	/// @param[out] texture_data The pointer to be set to the generated texture data.

Source/Core/DecoratorTiled.cpp

@@ -63,7 +63,7 @@ DecoratorTiled::Tile::Tile() : position(0, 0), size(1, 1)
 
 
 // Calculates the tile's dimensions from the texture and texture coordinates.
-void DecoratorTiled::Tile::CalculateDimensions(Element* element, const Texture& texture)
+void DecoratorTiled::Tile::CalculateDimensions(Element* element, const Texture& texture) const
 {
 	RenderInterface* render_interface = element->GetRenderInterface();
 	auto data_iterator = data.find(render_interface);
@@ -105,7 +105,7 @@ void DecoratorTiled::Tile::CalculateDimensions(Element* element, const Texture&
 }
 
 // Get this tile's dimensions.
-Vector2f DecoratorTiled::Tile::GetDimensions(Element* element)
+Vector2f DecoratorTiled::Tile::GetDimensions(Element* element) const
 {
 	RenderInterface* render_interface = element->GetRenderInterface();
 	auto data_iterator = data.find(render_interface);
@@ -275,7 +275,7 @@ void DecoratorTiled::Tile::GenerateGeometry(std::vector< Vertex >& vertices, std
 }
 
 // Scales a tile dimensions by a fixed value along one axis.
-void DecoratorTiled::ScaleTileDimensions(Vector2f& tile_dimensions, float axis_value, int axis)
+void DecoratorTiled::ScaleTileDimensions(Vector2f& tile_dimensions, float axis_value, int axis) const
 {
 	if (tile_dimensions[axis] != axis_value)
 	{

Source/Core/DecoratorTiled.h

@@ -87,9 +87,9 @@ public:
 		Tile();
 
 		/// Calculates the tile's dimensions from the texture and texture coordinates.
-		void CalculateDimensions(Element* element, const Texture& texture);
+		void CalculateDimensions(Element* element, const Texture& texture) const;
 		/// Get this tile's dimensions.
-		Vector2f GetDimensions(Element* element);
+		Vector2f GetDimensions(Element* element) const;
 
 		/// Generates geometry to render this tile across a surface.
 		/// @param[out] vertices The array to store the generated vertex data.
@@ -127,7 +127,7 @@ protected:
 	/// @param tile_dimensions[in, out] The tile dimensions to scale.
 	/// @param axis_value[in] The fixed value to scale against.
 	/// @param axis[in] The axis to scale against; either 0 (for x) or 1 (for y).
-	void ScaleTileDimensions(Vector2f& tile_dimensions, float axis_value, int axis);
+	void ScaleTileDimensions(Vector2f& tile_dimensions, float axis_value, int axis) const;
 };
 
 }

Source/Core/DecoratorTiledBox.cpp

@@ -106,7 +106,7 @@ bool DecoratorTiledBox::Initialise(const Tile* _tiles, const Texture* _textures)
 }
 
 // Called on a decorator to generate any required per-element data for a newly decorated element.
-DecoratorDataHandle DecoratorTiledBox::GenerateElementData(Element* element)
+DecoratorDataHandle DecoratorTiledBox::GenerateElementData(Element* element) const
 {
 	// Initialise the tiles for this element.
 	for (int i = 0; i < 9; i++)
@@ -278,13 +278,13 @@ DecoratorDataHandle DecoratorTiledBox::GenerateElementData(Element* element)
 }
 
 // Called to release element data generated by this decorator.
-void DecoratorTiledBox::ReleaseElementData(DecoratorDataHandle element_data)
+void DecoratorTiledBox::ReleaseElementData(DecoratorDataHandle element_data) const
 {
 	delete reinterpret_cast< DecoratorTiledBoxData* >(element_data);
 }
 
 // Called to render the decorator on an element.
-void DecoratorTiledBox::RenderElement(Element* element, DecoratorDataHandle element_data)
+void DecoratorTiledBox::RenderElement(Element* element, DecoratorDataHandle element_data) const
 {
 	Vector2f translation = element->GetAbsoluteOffset(Box::PADDING).Round();
 	DecoratorTiledBoxData* data = reinterpret_cast< DecoratorTiledBoxData* >(element_data);

Source/Core/DecoratorTiledBox.h

@@ -51,12 +51,12 @@ public:
 	bool Initialise(const Tile* tiles, const Texture* textures);
 
 	/// Called on a decorator to generate any required per-element data for a newly decorated element.
-	virtual DecoratorDataHandle GenerateElementData(Element* element);
+	DecoratorDataHandle GenerateElementData(Element* element) const override;
 	/// Called to release element data generated by this decorator.
-	virtual void ReleaseElementData(DecoratorDataHandle element_data);
+	void ReleaseElementData(DecoratorDataHandle element_data) const override;
 
 	/// Called to render the decorator on an element.
-	virtual void RenderElement(Element* element, DecoratorDataHandle element_data);
+	void RenderElement(Element* element, DecoratorDataHandle element_data) const override;
 
 private:
 	enum

Source/Core/DecoratorTiledHorizontal.cpp

@@ -91,7 +91,7 @@ bool DecoratorTiledHorizontal::Initialise(const Tile* _tiles, const Texture* _te
 }
 
 // Called on a decorator to generate any required per-element data for a newly decorated element.
-DecoratorDataHandle DecoratorTiledHorizontal::GenerateElementData(Element* element)
+DecoratorDataHandle DecoratorTiledHorizontal::GenerateElementData(Element* element) const
 {
 	// Initialise the tiles for this element.
 	for (int i = 0; i < 3; i++)
@@ -135,13 +135,13 @@ DecoratorDataHandle DecoratorTiledHorizontal::GenerateElementData(Element* eleme
 }
 
 // Called to release element data generated by this decorator.
-void DecoratorTiledHorizontal::ReleaseElementData(DecoratorDataHandle element_data)
+void DecoratorTiledHorizontal::ReleaseElementData(DecoratorDataHandle element_data) const
 {
 	delete reinterpret_cast< DecoratorTiledHorizontalData* >(element_data);
 }
 
 // Called to render the decorator on an element.
-void DecoratorTiledHorizontal::RenderElement(Element* element, DecoratorDataHandle element_data)
+void DecoratorTiledHorizontal::RenderElement(Element* element, DecoratorDataHandle element_data) const
 {
 	Vector2f translation = element->GetAbsoluteOffset(Box::PADDING).Round();
 	DecoratorTiledHorizontalData* data = reinterpret_cast< DecoratorTiledHorizontalData* >(element_data);

Source/Core/DecoratorTiledHorizontal.h

@@ -51,12 +51,12 @@ public:
 	bool Initialise(const Tile* tiles, const Texture* textures);
 
 	/// Called on a decorator to generate any required per-element data for a newly decorated element.
-	virtual DecoratorDataHandle GenerateElementData(Element* element);
+	DecoratorDataHandle GenerateElementData(Element* element) const override;
 	/// Called to release element data generated by this decorator.
-	virtual void ReleaseElementData(DecoratorDataHandle element_data);
+	void ReleaseElementData(DecoratorDataHandle element_data) const override;
 
 	/// Called to render the decorator on an element.
-	virtual void RenderElement(Element* element, DecoratorDataHandle element_data);
+	void RenderElement(Element* element, DecoratorDataHandle element_data) const override;
 
 private:
 	enum

Source/Core/DecoratorTiledImage.cpp

@@ -51,7 +51,7 @@ bool DecoratorTiledImage::Initialise(const Tile& _tile, const Texture& _texture)
 }
 
 // Called on a decorator to generate any required per-element data for a newly decorated element.
-DecoratorDataHandle DecoratorTiledImage::GenerateElementData(Element* element)
+DecoratorDataHandle DecoratorTiledImage::GenerateElementData(Element* element) const
 {
 	// Calculate the tile's dimensions for this element.
 	tile.CalculateDimensions(element, *GetTexture(tile.texture_index));
@@ -66,13 +66,13 @@ DecoratorDataHandle DecoratorTiledImage::GenerateElementData(Element* element)
 }
 
 // Called to release element data generated by this decorator.
-void DecoratorTiledImage::ReleaseElementData(DecoratorDataHandle element_data)
+void DecoratorTiledImage::ReleaseElementData(DecoratorDataHandle element_data) const
 {
 	delete reinterpret_cast< Geometry* >(element_data);
 }
 
 // Called to render the decorator on an element.
-void DecoratorTiledImage::RenderElement(Element* element, DecoratorDataHandle element_data)
+void DecoratorTiledImage::RenderElement(Element* element, DecoratorDataHandle element_data) const
 {
 	Geometry* data = reinterpret_cast< Geometry* >(element_data);
 	data->Render(element->GetAbsoluteOffset(Box::PADDING).Round());

Source/Core/DecoratorTiledImage.h

@@ -51,12 +51,12 @@ public:
 	bool Initialise(const Tile& tile, const Texture& texture);
 
 	/// Called on a decorator to generate any required per-element data for a newly decorated element.
-	virtual DecoratorDataHandle GenerateElementData(Element* element);
+	DecoratorDataHandle GenerateElementData(Element* element) const override;
 	/// Called to release element data generated by this decorator.
-	virtual void ReleaseElementData(DecoratorDataHandle element_data);
+	void ReleaseElementData(DecoratorDataHandle element_data) const override;
 
 	/// Called to render the decorator on an element.
-	virtual void RenderElement(Element* element, DecoratorDataHandle element_data);
+	void RenderElement(Element* element, DecoratorDataHandle element_data) const override;
 
 private:
 	Tile tile;

Source/Core/DecoratorTiledVertical.cpp

@@ -92,7 +92,7 @@ bool DecoratorTiledVertical::Initialise(const Tile* _tiles, const Texture* _text
 }
 
 // Called on a decorator to generate any required per-element data for a newly decorated element.
-DecoratorDataHandle DecoratorTiledVertical::GenerateElementData(Element* element)
+DecoratorDataHandle DecoratorTiledVertical::GenerateElementData(Element* element) const
 {
 	// Initialise the tile for this element.
 	for (int i = 0; i < 3; i++)
@@ -136,13 +136,13 @@ DecoratorDataHandle DecoratorTiledVertical::GenerateElementData(Element* element
 }
 
 // Called to release element data generated by this decorator.
-void DecoratorTiledVertical::ReleaseElementData(DecoratorDataHandle element_data)
+void DecoratorTiledVertical::ReleaseElementData(DecoratorDataHandle element_data) const
 {
 	delete reinterpret_cast< DecoratorTiledVerticalData* >(element_data);
 }
 
 // Called to render the decorator on an element.
-void DecoratorTiledVertical::RenderElement(Element* element, DecoratorDataHandle element_data)
+void DecoratorTiledVertical::RenderElement(Element* element, DecoratorDataHandle element_data) const
 {
 	Vector2f translation = element->GetAbsoluteOffset(Box::PADDING);
 	DecoratorTiledVerticalData* data = reinterpret_cast< DecoratorTiledVerticalData* >(element_data);

Source/Core/DecoratorTiledVertical.h

@@ -51,12 +51,12 @@ public:
 	bool Initialise(const Tile* tiles, const Texture* textures);
 
 	/// Called on a decorator to generate any required per-element data for a newly decorated element.
-	virtual DecoratorDataHandle GenerateElementData(Element* element);
+	DecoratorDataHandle GenerateElementData(Element* element) const override;
 	/// Called to release element data generated by this decorator.
-	virtual void ReleaseElementData(DecoratorDataHandle element_data);
+	void ReleaseElementData(DecoratorDataHandle element_data) const override;
 
 	/// Called to render the decorator on an element.
-	virtual void RenderElement(Element* element, DecoratorDataHandle element_data);
+	void RenderElement(Element* element, DecoratorDataHandle element_data) const override;
 
 private:
 	enum

Source/Core/ElementDecoration.cpp

@@ -65,7 +65,7 @@ bool ElementDecoration::ReloadDecorators()
 }
 
 // Loads a single decorator and adds it to the list of loaded decorators for this element.
-int ElementDecoration::LoadDecorator(std::shared_ptr<Decorator> decorator)
+int ElementDecoration::LoadDecorator(std::shared_ptr<const Decorator> decorator)
 {
 	DecoratorHandle element_decorator;
 	element_decorator.decorator_data = decorator->GenerateElementData(element);

Source/Core/ElementDecoration.h

@@ -59,7 +59,7 @@ public:
 
 private:
 	// Loads a single decorator and adds it to the list of loaded decorators for this element.
-	int LoadDecorator(std::shared_ptr<Decorator> decorator);
+	int LoadDecorator(std::shared_ptr<const Decorator> decorator);
 	// Releases existing decorators and loads all decorators required by the element's definition.
 	bool ReloadDecorators();
 	// Releases all existing decorators and frees their data.
@@ -67,7 +67,7 @@ private:
 
 	struct DecoratorHandle
 	{
-		std::shared_ptr<Decorator> decorator;
+		std::shared_ptr<const Decorator> decorator;
 		DecoratorDataHandle decorator_data;
 	};
 

Source/Core/FontFaceHandle.cpp

@@ -292,7 +292,7 @@ void FontFaceHandle::OnReferenceDeactivate()
 }
 
 // Generates (or shares) a layer derived from a font effect.
-FontFaceLayer* FontFaceHandle::GenerateLayer(const std::shared_ptr<FontEffect>& font_effect)
+FontFaceLayer* FontFaceHandle::GenerateLayer(const std::shared_ptr<const FontEffect>& font_effect)
 {
 	// See if this effect has been instanced before, as part of a different configuration.
 	FontLayerMap::iterator i = layers.find(font_effect.get());

Source/Core/FontFaceHandle.h

@@ -117,7 +117,7 @@ public:
 protected:
 	/// Destroys the handle.
 	void OnReferenceDeactivate() override;
-	FontFaceLayer* GenerateLayer(const std::shared_ptr<FontEffect>& font_effect);
+	FontFaceLayer* GenerateLayer(const std::shared_ptr<const FontEffect>& font_effect);
 	virtual int GetKerning(word lhs, word rhs) const = 0;
 
 	typedef std::vector< int > GlyphKerningList;

Source/Core/FontFaceLayer.cpp

@@ -44,7 +44,7 @@ FontFaceLayer::~FontFaceLayer()
 }
 
 // Generates the character and texture data for the layer.
-bool FontFaceLayer::Initialise(const FontFaceHandle* _handle, std::shared_ptr<FontEffect> _effect, const FontFaceLayer* clone, bool deep_clone)
+bool FontFaceLayer::Initialise(const FontFaceHandle* _handle, std::shared_ptr<const FontEffect> _effect, const FontFaceLayer* clone, bool deep_clone)
 {
 	handle = _handle;
 	effect = _effect;

Source/Core/FontFaceLayer.h

@@ -61,7 +61,7 @@ public:
 	/// @param[in] clone The layer to optionally clone geometry and texture data from.
 	/// @param[in] deep_clone If true, the clones geometry will be completely cloned and the effect will have no option to affect even the glyph origins.
 	/// @return True if the layer was generated successfully, false if not.
-	virtual bool Initialise(const FontFaceHandle* handle, std::shared_ptr<FontEffect> effect = {}, const FontFaceLayer* clone = NULL, bool deep_clone = false);
+	virtual bool Initialise(const FontFaceHandle* handle, std::shared_ptr<const FontEffect> effect = {}, const FontFaceLayer* clone = NULL, bool deep_clone = false);
 
 	/// Generates the texture data for a layer (for the texture database).
 	/// @param[out] texture_data The pointer to be set to the generated texture data.
@@ -137,7 +137,7 @@ public:
 	typedef std::vector< Texture > TextureList;
 
 	const FontFaceHandle* handle;
-	std::shared_ptr<FontEffect> effect;
+	std::shared_ptr<const FontEffect> effect;
 
 	TextureLayout texture_layout;
 

Source/Core/StyleSheet.cpp

@@ -297,7 +297,7 @@ FontEffectList StyleSheet::InstanceFontEffectsFromString(const String& font_effe
 
 	// Partition the list such that the back layer effects appear before the front layer effects
 	std::stable_partition(font_effect_list.begin(), font_effect_list.end(), 
-		[](const std::shared_ptr<FontEffect>& effect) { return effect->GetLayer() == FontEffect::Layer::Back; }
+		[](const std::shared_ptr<const FontEffect>& effect) { return effect->GetLayer() == FontEffect::Layer::Back; }
 	);
 
 	return font_effect_list;