handle missing icon for widget

Author: DeltaGW2

src/Core/RadialContext.cpp

@@ -541,8 +541,6 @@ void CRadialContext::RenderWidget()
 {
 	if (this->QueuedItem == nullptr && !this->IsEditingWidget) { return; }
 
-	static Texture* icon = APIDefs->Textures.Get("ICON_GENERIC");
-
 	ImGuiStyle& style = ImGui::GetStyle();
 
 	float sz = 52.0f * NexusLink->Scaling;
@@ -597,6 +595,9 @@ void CRadialContext::RenderWidget()
 			drawList->AddLine(circle[amtTotal - 1], circle[0], color, thickness);
 		}
 
+		bool useFallback = this->QueuedItem->Icon.Type == EIconType::None || this->QueuedItem->Icon.Value.empty();
+		Texture* icon = !useFallback ? this->QueuedItem->Icon.Texture : this->WidgetFallbackIcon;
+
 		if (icon)
 		{
 			ImVec2 iconSize = isHovered ? ImVec2(sz * 1.2f, sz * 1.2f) : ImVec2(sz, sz);
@@ -608,6 +609,7 @@ void CRadialContext::RenderWidget()
 				float diff = (iconSize.x - sz) / 2.0f;
 				iconPos = ImVec2(iconPos.x - diff, iconPos.y - diff);
 			}
+
 			if (this->WidgetBase)
 			{
 				ImGui::SetCursorPos(iconPos);
@@ -619,7 +621,7 @@ void CRadialContext::RenderWidget()
 			}
 
 			ImGui::SetCursorPos(iconPos);
-			ImGui::Image(this->QueuedItem ? this->QueuedItem->Icon.Texture->Resource : icon->Resource, iconSize);
+			ImGui::Image(icon->Resource, iconSize);
 
 			if (isEditing)
 			{
@@ -644,6 +646,16 @@ void CRadialContext::RenderWidget()
 				}
 			}
 		}
+		else
+		{
+			if (!icon && !useFallback)
+			{
+				this->QueuedItem->Icon.Type = EIconType::None;
+				this->QueuedItem->Icon.Value = {};
+			}
+
+			this->WidgetFallbackIcon = APIDefs->Textures.GetOrCreateFromResource("ICON_RADIALWIDGET_FALLBACK", ICON_FALLBACK, SelfModule);
+		}
 	}
 	ImGui::End();
 }

src/Core/RadialContext.h

@@ -23,8 +23,8 @@
 class CRadialContext
 {
 	public:
-	bool IsLeftClickHeld = false;
-	bool IsRightClickHeld = false;
+	bool                                IsLeftClickHeld    = false;
+	bool                                IsRightClickHeld   = false;
 
 	///----------------------------------------------------------------------------------------------------
 	/// ctor
@@ -64,19 +64,20 @@ class CRadialContext
 	std::mutex                          Mutex;
 	std::vector<CRadialMenu*>           Radials;
 	std::map<std::string, CRadialMenu*> RadialIBMap;
-	CRadialMenu*                        ActiveRadial = nullptr;
+	CRadialMenu*                        ActiveRadial       = nullptr;
 
 	/* Queued Item */
 	std::mutex                          QueuedItemMutex;
-	bool                                IsCanceled = false;
-	RadialItem*                         QueuedItem = nullptr;
-	int                                 QueuedElapsedTime = 0;
-	Texture*                            WidgetBase = nullptr;
+	bool                                IsCanceled         = false;
+	RadialItem*                         QueuedItem         = nullptr;
+	int                                 QueuedElapsedTime  = 0;
+	Texture*                            WidgetBase         = nullptr;
+	Texture*                            WidgetFallbackIcon = nullptr;
 
 	/* Editor */
-	CRadialMenu*                        EditingMenu = nullptr;
-	RadialItem*                         EditingItem = nullptr;
-	bool                                IsEditingWidget = false;
+	CRadialMenu*                        EditingMenu        = nullptr;
+	RadialItem*                         EditingItem        = nullptr;
+	bool                                IsEditingWidget    = false;
 
 	void RenderEditorTab();
 	void RenderSettingsTab();

src/GW2-RadialMenus.rc

@@ -36,6 +36,7 @@
 #define ICON_SIEGETURTLE			308
 
 #define TEX_WIDGET_BASE				400
+#define ICON_FALLBACK				401
 
 // Next default values for new objects
 //