From 60f83c1b5ef4dc0de532a0bae91c4a019b47eb3a Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Mon, 21 Nov 2016 17:04:08 +0100
Subject: [PATCH] Set icons for child windows

---
 qrenderdoc/Code/CaptureContext.cpp | 7 +++++++
 qrenderdoc/Code/CaptureContext.h   | 3 +++
 qrenderdoc/Windows/MainWindow.cpp  | 1 +
 3 files changed, 11 insertions(+)

diff --git a/qrenderdoc/Code/CaptureContext.cpp b/qrenderdoc/Code/CaptureContext.cpp
index 7971aca2c..09f11b0b4 100644
--- a/qrenderdoc/Code/CaptureContext.cpp
+++ b/qrenderdoc/Code/CaptureContext.cpp
@@ -52,6 +52,9 @@ CaptureContext::CaptureContext(QString paramFilename, QString remoteHost, uint32
 
   qApp->setApplicationVersion(RENDERDOC_GetVersionString());
 
+  m_Icon = new QIcon();
+  m_Icon->addFile(QStringLiteral(":/Resources/icon.ico"), QSize(), QIcon::Normal, QIcon::Off);
+
   m_MainWindow = new MainWindow(this);
   m_MainWindow->show();
 
@@ -65,6 +68,7 @@ CaptureContext::CaptureContext(QString paramFilename, QString remoteHost, uint32
 
 CaptureContext::~CaptureContext()
 {
+  delete m_Icon;
   m_Renderer.CloseThread();
   delete m_MainWindow;
 }
@@ -407,6 +411,7 @@ EventBrowser *CaptureContext::eventBrowser()
 
   m_EventBrowser = new EventBrowser(this, m_MainWindow);
   m_EventBrowser->setObjectName("eventBrowser");
+  m_EventBrowser->setWindowIcon(*m_Icon);
 
   return m_EventBrowser;
 }
@@ -418,6 +423,7 @@ TextureViewer *CaptureContext::textureViewer()
 
   m_TextureViewer = new TextureViewer(this, m_MainWindow);
   m_TextureViewer->setObjectName("textureViewer");
+  m_TextureViewer->setWindowIcon(*m_Icon);
 
   return m_TextureViewer;
 }
@@ -437,6 +443,7 @@ CaptureDialog *CaptureContext::captureDialog()
              CaptureOptions opts) { return m_MainWindow->OnInjectTrigger(PID, env, name, opts); },
       m_MainWindow);
   m_CaptureDialog->setObjectName("capDialog");
+  m_CaptureDialog->setWindowIcon(*m_Icon);
 
   return m_CaptureDialog;
 }
diff --git a/qrenderdoc/Code/CaptureContext.h b/qrenderdoc/Code/CaptureContext.h
index 05c647460..7299712e9 100644
--- a/qrenderdoc/Code/CaptureContext.h
+++ b/qrenderdoc/Code/CaptureContext.h
@@ -123,6 +123,7 @@ public:
   WindowingSystem m_CurWinSystem;
   void *FillWindowingData(WId widget);
 
+  const QIcon &winIcon() { return *m_Icon; }
   MainWindow *mainWindow() { return m_MainWindow; }
   EventBrowser *eventBrowser();
   TextureViewer *textureViewer();
@@ -190,6 +191,8 @@ private:
   Display *m_X11Display;
 #endif
 
+  QIcon *m_Icon;
+
   // Windows
   QProgressDialog *m_Progress;
   MainWindow *m_MainWindow = NULL;
diff --git a/qrenderdoc/Windows/MainWindow.cpp b/qrenderdoc/Windows/MainWindow.cpp
index 8d072ba09..77aa8acc4 100644
--- a/qrenderdoc/Windows/MainWindow.cpp
+++ b/qrenderdoc/Windows/MainWindow.cpp
@@ -654,6 +654,7 @@ void MainWindow::PopulateRecentCaptures()
 
 void MainWindow::ShowLiveCapture(LiveCapture *live)
 {
+  live->setWindowIcon(m_Ctx->winIcon());
   m_LiveCaptures.push_back(live);
   ui->toolWindowManager->addToolWindow(live, mainToolArea());
 }