[SUTK] when changing font in SmallText, mark it as redraw

- this fixes no visual updates upon font change on SmallText after previous commit (GPU usage reduction)
ravi688 · Dec 10, 2024 · 1b123ae · 1b123ae
1 parent cf4b918
commit 1b123ae
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/sutk/include/sutk/Renderable.hpp b/sutk/include/sutk/Renderable.hpp
@@ -21,6 +21,10 @@ namespace SUTK
 		RenderableContainer* m_container;
 		u32 m_drawOrder;
 		bool m_isDrawOrderDirty;
+		com::Bool m_isRedraw;
+
+		// Called by UIDriver to reset the redraw flag
+		void setRedraw(com::Bool isRedraw) noexcept { m_isRedraw = isRedraw; }
 
 	protected:
 		// Rendering Geometries (or Text) requires conversion from local coordinates to global coordinates (target rendering backend, SGE)
@@ -49,6 +53,9 @@ namespace SUTK
 		void setDrawOrder(u32 drawOrder) { m_drawOrder = drawOrder;  m_isDrawOrderDirty = true; }
 		u32 getDrawOrder() const noexcept { return m_drawOrder; }
 
+		com::Bool isRedraw() const noexcept { return com::Bool { m_isRedraw || com::cast_away_const(this)->isDirty() || isDrawOrderDirty() }; }
+		void redraw() noexcept { m_isRedraw = com::True; }
+
 		bool ensureUpdated() noexcept
 		{ 
 			if(isDirty()) 

diff --git a/sutk/source/Renderable.cpp b/sutk/source/Renderable.cpp
@@ -4,7 +4,7 @@
 
 namespace SUTK
 {
-	Renderable::Renderable(UIDriver& driver, RenderableContainer* container) noexcept : UIDriverObject(driver), m_container(container), m_drawOrder(0), m_isDrawOrderDirty(true)
+	Renderable::Renderable(UIDriver& driver, RenderableContainer* container) noexcept : UIDriverObject(driver), m_container(container), m_drawOrder(0), m_isDrawOrderDirty(true), m_isRedraw(com::False)
 	{
 		if(container != NULL)
 		{

diff --git a/sutk/source/SmallText.cpp b/sutk/source/SmallText.cpp
@@ -219,6 +219,7 @@ namespace SUTK
 	void SmallText::setFont(UIDriver::FontReference font) noexcept
 	{
 		getGfxDriver().setTextFont(getGfxDriverObjectHandle(), font);
+		redraw();
 	}
 	f32 SmallText::getBaselineHeight() noexcept
 	{

diff --git a/sutk/source/UIDriver.cpp b/sutk/source/UIDriver.cpp
@@ -97,18 +97,15 @@ namespace SUTK
 		for(auto it = m_renderables.begin(); it != m_renderables.end(); it++)
 		{
 			Renderable* renderable = *it;
-			if(renderable->isDirty())
+			if(!isRerender && renderable->isRedraw())
 			{
-				renderable->update();
-				if(!isRerender)
-					isRerender = com::True;
+				isRerender = com::True;
+				renderable->setRedraw(com::False);
 			}
+			if(renderable->isDirty())
+				renderable->update();
 			if(renderable->isDrawOrderDirty())
-			{
 				isRecalculateDrawOrder = true;
-				if(!isRerender)
-					isRerender = com::True;
-			}
 			u32 drawOrder = renderable->getDrawOrder();
 			if(drawOrder < minDrawOrder)
 				minDrawOrder = drawOrder;