Initial icon integration. Should work on X11 and Windows (but doesn't integrate as an ICO resource), although only tested on X11 so far. Still needs work to display properly on Wayland and MacOS. Fixes #204.

Author: azonenberg

src/ngscopeclient/AboutDialog.cpp

@@ -94,6 +94,12 @@ bool AboutDialog::DoRender()
 		nullptr		//userData
 	};
 
+	float iconsize = 5 * ImGui::GetFontSize();
+	float width = ImGui::GetContentRegionAvail().x;
+	float off = (width - iconsize) * 0.5;
+	ImGui::SetCursorPosX(ImGui::GetCursorPosX() + off);
+	ImGui::Image(m_parent->GetTexture("app-icon"), ImVec2(iconsize, iconsize));
+
 	ImGuiTabBarFlags tab_bar_flags = ImGuiTabBarFlags_None;
 	if (ImGui::BeginTabBar("MyTabBar", tab_bar_flags))
 	{

src/ngscopeclient/MainWindow_Icons.cpp

@@ -229,10 +229,14 @@ void MainWindow::LoadAppIcon()
 		//Wayland gets icons from the .desktop file unless you have xdg-toplevel-icon which glfw doesn't support
 
 		//Load the images
-		const int nimages = 1;
+		const int nimages = 5;
 		GLFWimage images[nimages] =
 		{
-			m_texmgr.LoadPNGToGLFWImage(FindDataFile("icons/32x32/app-icon.png"))
+			m_texmgr.LoadPNGToGLFWImage(FindDataFile("icons/16x16/app-icon.png")),
+			m_texmgr.LoadPNGToGLFWImage(FindDataFile("icons/32x32/app-icon.png")),
+			m_texmgr.LoadPNGToGLFWImage(FindDataFile("icons/48x48/app-icon.png")),
+			m_texmgr.LoadPNGToGLFWImage(FindDataFile("icons/128x128/app-icon.png")),
+			m_texmgr.LoadPNGToGLFWImage(FindDataFile("icons/256x256/app-icon.png"))
 		};
 
 		//Set it as the window icon
@@ -242,6 +246,8 @@ void MainWindow::LoadAppIcon()
 		for(auto img : images)
 			delete[] img.pixels;
 	#endif
+
+	m_texmgr.LoadTexture("app-icon", FindDataFile("icons/256x256/app-icon.png"));
 }
 
 /**