rearrange layout + add Show addon menu button

Author: megai2

src/Gui.cpp

@@ -63,54 +63,93 @@ void Gui::MainWindow::act()
 
 	ImGui::Begin("GW2 addon manager");
 
+	ImGui::Text("Active addons");
+	ImGui::NewLine();
+
+	int idx = 0;
+	char perAddonTag[256];
+
 	for (const auto& i : gAddon().main.GetAddonList())
 	{
-		ImGui::Text("%S", i.name);
+		++idx;
+		if ((i.status != GW2AL_OK) || !i.dsc)
+			continue;
+	
+		ImGui::Text("%S v%u.%u build %u", i.name, i.dsc->majorVer, i.dsc->minorVer, i.dsc->revision);
 
-		if (i.status == GW2AL_OK)
+		sprintf_s(perAddonTag, "O##%S", i.name);
+
+		ImGui::SameLine();
+		if (ImGui::Button(perAddonTag) && idx != activeIndex)
+			activeIndex = idx;
+		
+		if (idx == activeIndex)
 		{
-			ImGui::SameLine();
-			if (!i.dsc)
-			{				
-				ImGui::Text("E: [no description found]");
-				continue;
-			} 
-
-			ImGui::Text("v%u.%u build %u", i.dsc->majorVer, i.dsc->minorVer, i.dsc->revision);
-			//TODO: make it a hover popup
+			ImGui::NewLine();
 			ImGui::Text("%S", i.dsc->description);
-		}
-		else {
-			ImGui::SameLine();
-			switch (i.status)
+			if (i.menuShowProc)
 			{
-			case GW2AL_BAD_DLL:
-				ImGui::Text("E: [missing one of export functions]");
-				break;
-			case GW2AL_NOT_FOUND:
-				ImGui::Text("E: [dll not found]");
-				break;
-			case GW2AL_DEP_NOT_LOADED:
-				ImGui::Text("E: [dependency missing]");
-				break;
-			case GW2AL_DEP_OUTDATED:
-				ImGui::Text("E: [dependency outdated]");
-				break;
-			default:
-				ImGui::Text("E: [general failure]");
-				break;
-			}
+				sprintf_s(perAddonTag, "Show addon menu##%S", i.name);
+				if (ImGui::Button(perAddonTag))
+				{
+					i.menuShowProc();
+				}
+			}		
+			//TODO: make this work
+			ImGui::SameLine();
+			ImGui::Button("Update");
+			ImGui::SameLine();
+			ImGui::Button("Reload");
+			ImGui::SameLine();
+			ImGui::Button("Disable");
 		}
+	}
 
-		//TODO: make this work
-		ImGui::Button("Update");
-		ImGui::SameLine();
-		ImGui::Button("Reload");
-		ImGui::SameLine();
-		ImGui::Button("Disable");
-		ImGui::SameLine();
-		ImGui::Button("Open config menu");
+	ImGui::Separator();
+	ImGui::Text("Inactive addons");
+	ImGui::NewLine();
+
+	for (const auto& i : gAddon().main.GetAddonList())
+	{
+		if ((i.status == GW2AL_OK) && i.dsc)
+			continue;
+
+		ImGui::Text("%S", i.name);
+
+		switch (i.status)
+		{
+		case GW2AL_BAD_DLL:
+			ImGui::Text("E: [missing one of export functions]");
+			break;
+		case GW2AL_NOT_FOUND:
+			ImGui::Text("E: [dll not found]");
+			break;
+		case GW2AL_DEP_NOT_LOADED:
+			ImGui::Text("E: [dependency missing]");
+			break;
+		case GW2AL_DEP_OUTDATED:
+			ImGui::Text("E: [dependency outdated]");
+			break;
+		case GW2AL_OK:
+			ImGui::Text("E: [no description found]");
+			break;
+		default:
+			ImGui::Text("E: [general failure]");
+			break;
+		}
+
+		ImGui::NewLine();
 	}
+
+	ImGui::Separator();
+
+	//TODO: make this work
+	ImGui::SameLine();
+	ImGui::Button("Update all");
+	ImGui::SameLine();
+	ImGui::Button("Reload all");
+	ImGui::SameLine();
+	ImGui::Button("Disable all");
 
 	ImGui::End();
 }

src/Gui.h

@@ -16,6 +16,7 @@ class Gui
 		bool visible;
 		void init();
 		void act();
+		int activeIndex = -1;
 	} mainWindow;
 
 public:

src/Main.cpp

@@ -37,6 +37,8 @@ void Main::updateAddonList()
 				item.status = GW2AL_FAIL;
 				item.hashedName = gAddon().api->hash_name(item.name);
 				item.dsc = nullptr;
+				item.showConfigPage = false;
+				item.menuShowProc = nullptr;
 
 				/*
 				constexpr size_t mbstrSz = 4096;
@@ -66,6 +68,11 @@ void Main::updateAddonStatuses()
 			i.status = GW2AL_OK;
 		else //otherwise try to load it again and store load error in status
 			i.status = gAddon().api->load_addon(i.name);
+
+		wchar_t sMenuProc[2048];
+		wsprintf(sMenuProc, L"%s_ExternalShowMenu", i.name);
+		auto sMenuHa = gAddon().api->hash_name(sMenuProc);
+		i.menuShowProc = (ExternalMenuShowProcType)gAddon().api->query_function(sMenuHa);
 	}
 }
 

src/Main.h

@@ -1,14 +1,19 @@
 #pragma once
 #include "stdafx.h"
 
+typedef void(*ExternalMenuShowProcType)();
+
 class Main
 {
 public:
+
 	struct AddonListEntry
 	{
 		wchar_t* name;
 		gw2al_api_ret status;
 		gw2al_hashed_name hashedName;
+		ExternalMenuShowProcType menuShowProc;
+		bool showConfigPage;
 		const gw2al_addon_dsc* dsc;
 	};
 	const std::vector<AddonListEntry>& GetAddonList() { return addonList; }