Drawing context to return if it can draw icons or not.

kovacsv · kovacsv · commit 231a78ac2995 · 2020-06-15T10:29:20.000+02:00
diff --git a/Sources/BuiltInNodes/BI_UINodeLayouts.cpp b/Sources/BuiltInNodes/BI_UINodeLayouts.cpp
@@ -19,7 +19,7 @@ void HeaderBasedLayout::AddPanels (	const BasicUINode& uiNode,
 		nodeStatus = NodeUIHeaderPanel::NodeStatus::HasValue;
 	}
 	std::wstring nodeName = uiNode.GetNodeName ().GetLocalized ();
-	if (uiNode.HasIconId ()) {
+	if (uiNode.HasIconId () && env.GetDrawingContext ().CanDrawIcon ()) {
 		drawer.AddPanel (NUIE::NodeUIPanelPtr (new NodeUIIconHeaderPanel (nodeName, nodeStatus, uiNode.GetIconId (), env)));
 	} else {
 		drawer.AddPanel (NUIE::NodeUIPanelPtr (new NodeUIHeaderPanel (nodeName, nodeStatus)));
diff --git a/Sources/NodeUIEngine/NUIE_DrawingContext.cpp b/Sources/NodeUIEngine/NUIE_DrawingContext.cpp
@@ -94,6 +94,11 @@ Size DrawingContextDecorator::MeasureText (const Font& font, const std::wstring&
 	return decorated.MeasureText (font, text);
 }
 
+bool DrawingContextDecorator::CanDrawIcon ()
+{
+	return decorated.CanDrawIcon ();
+}
+
 void DrawingContextDecorator::DrawIcon (const Rect& rect, const IconId& iconId)
 {
 	decorated.DrawIcon (rect, iconId);
@@ -169,6 +174,11 @@ Size NullDrawingContext::MeasureText (const Font&, const std::wstring&)
 	return Size ();
 }
 
+bool NullDrawingContext::CanDrawIcon ()
+{
+	return false;
+}
+
 void NullDrawingContext::DrawIcon (const Rect&, const IconId&)
 {
 
diff --git a/Sources/NodeUIEngine/NUIE_DrawingContext.hpp b/Sources/NodeUIEngine/NUIE_DrawingContext.hpp
@@ -44,6 +44,7 @@ class DrawingContext
 	virtual void	DrawFormattedText (const Rect& rect, const Font& font, const std::wstring& text, HorizontalAnchor hAnchor, VerticalAnchor vAnchor, const Color& textColor) = 0;
 	virtual Size	MeasureText (const Font& font, const std::wstring& text) = 0;
 
+	virtual bool	CanDrawIcon () = 0;
 	virtual void	DrawIcon (const Rect& rect, const IconId& iconId) = 0;
 };
 
@@ -75,6 +76,7 @@ class DrawingContextDecorator : public DrawingContext
 	virtual void	DrawFormattedText (const Rect& rect, const Font& font, const std::wstring& text, HorizontalAnchor hAnchor, VerticalAnchor vAnchor, const Color& textColor) override;
 	virtual Size	MeasureText (const Font& font, const std::wstring& text) override;
 
+	virtual bool	CanDrawIcon () override;
 	virtual void	DrawIcon (const Rect& rect, const IconId& iconId) override;
 
 protected:
@@ -106,6 +108,7 @@ class NullDrawingContext : public DrawingContext
 	virtual void	DrawFormattedText (const Rect& rect, const Font& font, const std::wstring& text, HorizontalAnchor hAnchor, VerticalAnchor vAnchor, const Color& textColor) override;
 	virtual Size	MeasureText (const Font& font, const std::wstring& text) override;
 
+	virtual bool	CanDrawIcon () override;
 	virtual void	DrawIcon (const Rect& rect, const IconId& iconId) override;
 };
 
diff --git a/Sources/NodeUIEngine/NUIE_SvgDrawingContext.cpp b/Sources/NodeUIEngine/NUIE_SvgDrawingContext.cpp
@@ -261,9 +261,14 @@ Size SvgDrawingContext::MeasureText (const Font& font, const std::wstring& text)
 	return Size (text.length () * font.GetSize (), font.GetSize () * 1.5);
 }
 
-void SvgDrawingContext::DrawIcon (const Rect&, const IconId&)
+bool SvgDrawingContext::CanDrawIcon ()
 {
+	return false;
+}
 
+void SvgDrawingContext::DrawIcon (const Rect&, const IconId&)
+{
+	DBGBREAK ();
 }
 
 std::wstring ReplaceAll (const std::wstring& string, const std::wstring& from, const std::wstring& to)
diff --git a/Sources/NodeUIEngine/NUIE_SvgDrawingContext.hpp b/Sources/NodeUIEngine/NUIE_SvgDrawingContext.hpp
@@ -59,6 +59,7 @@ class SvgDrawingContext : public DrawingContext
 	virtual void		FillEllipse (const Rect& rect, const Color& color) override;
 	virtual void		DrawFormattedText (const Rect& rect, const Font& font, const std::wstring& text, HorizontalAnchor hAnchor, VerticalAnchor vAnchor, const NUIE::Color& textColor) override;
 	virtual Size		MeasureText (const Font& font, const std::wstring& text) override;
+	virtual bool		CanDrawIcon () override;
 	virtual void		DrawIcon (const Rect& rect, const IconId& iconId) override;
 
 private:
diff --git a/Sources/WindowsAppSupport/WAS_BitmapContextGdi.cpp b/Sources/WindowsAppSupport/WAS_BitmapContextGdi.cpp
@@ -229,6 +229,11 @@ NUIE::Size BitmapContextGdi::MeasureText (const NUIE::Font& font, const std::wst
 	return NUIE::Size (gdiRect.right - gdiRect.left + 5, gdiRect.bottom - gdiRect.top);
 }
 
+bool BitmapContextGdi::CanDrawIcon ()
+{
+	return false;
+}
+
 void BitmapContextGdi::DrawIcon (const NUIE::Rect&, const NUIE::IconId&)
 {
 	DBGBREAK ();
diff --git a/Sources/WindowsAppSupport/WAS_BitmapContextGdi.hpp b/Sources/WindowsAppSupport/WAS_BitmapContextGdi.hpp
@@ -79,6 +79,7 @@ class BitmapContextGdi : public NUIE::NativeDrawingContext
 	virtual void				DrawFormattedText (const NUIE::Rect& rect, const NUIE::Font& font, const std::wstring& text, NUIE::HorizontalAnchor hAnchor, NUIE::VerticalAnchor vAnchor, const NUIE::Color& textColor) override;
 	virtual NUIE::Size			MeasureText (const NUIE::Font& font, const std::wstring& text) override;
 
+	virtual bool				CanDrawIcon () override;
 	virtual void				DrawIcon (const NUIE::Rect& rect, const NUIE::IconId& iconId) override;
 
 private:
diff --git a/Sources/WindowsAppSupport/WAS_BitmapContextGdiplus.cpp b/Sources/WindowsAppSupport/WAS_BitmapContextGdiplus.cpp
@@ -202,6 +202,11 @@ NUIE::Size BitmapContextGdiplus::MeasureText (const NUIE::Font& font, const std:
 	return NUIE::Size (textRect.Width, textRect.Height);
 }
 
+bool BitmapContextGdiplus::CanDrawIcon ()
+{
+	return false;
+}
+
 void BitmapContextGdiplus::DrawIcon (const NUIE::Rect&, const NUIE::IconId&)
 {
 	DBGBREAK ();
diff --git a/Sources/WindowsAppSupport/WAS_BitmapContextGdiplus.hpp b/Sources/WindowsAppSupport/WAS_BitmapContextGdiplus.hpp
@@ -41,6 +41,7 @@ class BitmapContextGdiplus : public NUIE::NativeDrawingContext
 	virtual void		DrawFormattedText (const NUIE::Rect& rect, const NUIE::Font& font, const std::wstring& text, NUIE::HorizontalAnchor hAnchor, NUIE::VerticalAnchor vAnchor, const NUIE::Color& textColor) override;
 	virtual NUIE::Size	MeasureText (const NUIE::Font& font, const std::wstring& text) override;
 
+	virtual bool		CanDrawIcon () override;
 	virtual void		DrawIcon (const NUIE::Rect& rect, const NUIE::IconId& iconId) override;
 
 private:
diff --git a/Sources/WindowsAppSupport/WAS_Direct2DContext.cpp b/Sources/WindowsAppSupport/WAS_Direct2DContext.cpp
@@ -296,6 +296,11 @@ NUIE::Size Direct2DContext::MeasureText (const NUIE::Font& font, const std::wstr
 	return NUIE::Size (metrics.width * SafetyTextRatio, metrics.height * SafetyTextRatio);
 }
 
+bool Direct2DContext::CanDrawIcon ()
+{
+	return true;
+}
+
 void Direct2DContext::DrawIcon (const NUIE::Rect& rect, const NUIE::IconId& iconId)
 {
 	if (imageLoader == nullptr) {
diff --git a/Sources/WindowsAppSupport/WAS_Direct2DContext.hpp b/Sources/WindowsAppSupport/WAS_Direct2DContext.hpp
@@ -56,6 +56,7 @@ class Direct2DContext : public NUIE::NativeDrawingContext
 	virtual void				DrawFormattedText (const NUIE::Rect& rect, const NUIE::Font& font, const std::wstring& text, NUIE::HorizontalAnchor hAnchor, NUIE::VerticalAnchor vAnchor, const NUIE::Color& textColor) override;
 	virtual NUIE::Size			MeasureText (const NUIE::Font& font, const std::wstring& text) override;
 
+	virtual bool				CanDrawIcon () override;
 	virtual void				DrawIcon (const NUIE::Rect& rect, const NUIE::IconId& iconId) override;
 
 private:

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ void HeaderBasedLayout::AddPanels ( const BasicUINode& uiNode,`
`19`	`19`	`nodeStatus = NodeUIHeaderPanel::NodeStatus::HasValue;`
`20`	`20`	`}`
`21`	`21`	`std::wstring nodeName = uiNode.GetNodeName ().GetLocalized ();`
`22`		`- if (uiNode.HasIconId ()) {`
	`22`	`+ if (uiNode.HasIconId () && env.GetDrawingContext ().CanDrawIcon ()) {`
`23`	`23`	`drawer.AddPanel (NUIE::NodeUIPanelPtr (new NodeUIIconHeaderPanel (nodeName, nodeStatus, uiNode.GetIconId (), env)));`
`24`	`24`	`} else {`
`25`	`25`	`drawer.AddPanel (NUIE::NodeUIPanelPtr (new NodeUIHeaderPanel (nodeName, nodeStatus)));`
Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,11 @@ Size DrawingContextDecorator::MeasureText (const Font& font, const std::wstring&`
`94`	`94`	`return decorated.MeasureText (font, text);`
`95`	`95`	`}`
`96`	`96`
	`97`	`+bool DrawingContextDecorator::CanDrawIcon ()`
	`98`	`+{`
	`99`	`+ return decorated.CanDrawIcon ();`
	`100`	`+}`
	`101`	`+`
`97`	`102`	`void DrawingContextDecorator::DrawIcon (const Rect& rect, const IconId& iconId)`
`98`	`103`	`{`
`99`	`104`	`decorated.DrawIcon (rect, iconId);`
`@@ -169,6 +174,11 @@ Size NullDrawingContext::MeasureText (const Font&, const std::wstring&)`
`169`	`174`	`return Size ();`
`170`	`175`	`}`
`171`	`176`
	`177`	`+bool NullDrawingContext::CanDrawIcon ()`
	`178`	`+{`
	`179`	`+ return false;`
	`180`	`+}`
	`181`	`+`
`172`	`182`	`void NullDrawingContext::DrawIcon (const Rect&, const IconId&)`
`173`	`183`	`{`
`174`	`184`
Original file line number	Diff line number	Diff line change
`@@ -261,9 +261,14 @@ Size SvgDrawingContext::MeasureText (const Font& font, const std::wstring& text)`
`261`	`261`	`return Size (text.length () * font.GetSize (), font.GetSize () * 1.5);`
`262`	`262`	`}`
`263`	`263`
`264`		`-void SvgDrawingContext::DrawIcon (const Rect&, const IconId&)`
	`264`	`+bool SvgDrawingContext::CanDrawIcon ()`
`265`	`265`	`{`
	`266`	`+ return false;`
	`267`	`+}`
`266`	`268`
	`269`	`+void SvgDrawingContext::DrawIcon (const Rect&, const IconId&)`
	`270`	`+{`
	`271`	`+ DBGBREAK ();`
`267`	`272`	`}`
`268`	`273`
`269`	`274`	`std::wstring ReplaceAll (const std::wstring& string, const std::wstring& from, const std::wstring& to)`
Original file line number	Diff line number	Diff line change
`@@ -229,6 +229,11 @@ NUIE::Size BitmapContextGdi::MeasureText (const NUIE::Font& font, const std::wst`
`229`	`229`	`return NUIE::Size (gdiRect.right - gdiRect.left + 5, gdiRect.bottom - gdiRect.top);`
`230`	`230`	`}`
`231`	`231`
	`232`	`+bool BitmapContextGdi::CanDrawIcon ()`
	`233`	`+{`
	`234`	`+ return false;`
	`235`	`+}`
	`236`	`+`
`232`	`237`	`void BitmapContextGdi::DrawIcon (const NUIE::Rect&, const NUIE::IconId&)`
`233`	`238`	`{`
`234`	`239`	`DBGBREAK ();`
Original file line number	Diff line number	Diff line change
`@@ -202,6 +202,11 @@ NUIE::Size BitmapContextGdiplus::MeasureText (const NUIE::Font& font, const std:`
`202`	`202`	`return NUIE::Size (textRect.Width, textRect.Height);`
`203`	`203`	`}`
`204`	`204`
	`205`	`+bool BitmapContextGdiplus::CanDrawIcon ()`
	`206`	`+{`
	`207`	`+ return false;`
	`208`	`+}`
	`209`	`+`
`205`	`210`	`void BitmapContextGdiplus::DrawIcon (const NUIE::Rect&, const NUIE::IconId&)`
`206`	`211`	`{`
`207`	`212`	`DBGBREAK ();`
Original file line number	Diff line number	Diff line change
`@@ -296,6 +296,11 @@ NUIE::Size Direct2DContext::MeasureText (const NUIE::Font& font, const std::wstr`
`296`	`296`	`return NUIE::Size (metrics.width * SafetyTextRatio, metrics.height * SafetyTextRatio);`
`297`	`297`	`}`
`298`	`298`
	`299`	`+bool Direct2DContext::CanDrawIcon ()`
	`300`	`+{`
	`301`	`+ return true;`
	`302`	`+}`
	`303`	`+`
`299`	`304`	`void Direct2DContext::DrawIcon (const NUIE::Rect& rect, const NUIE::IconId& iconId)`
`300`	`305`	`{`
`301`	`306`	`if (imageLoader == nullptr) {`