From 3224df835bdc49c3e38974cf0c4d3de06c6399b3 Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 9 Apr 2018 12:00:28 +0100 Subject: [PATCH] Fix disassembly view not working in shader viewer list of files --- qrenderdoc/Windows/ShaderViewer.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/qrenderdoc/Windows/ShaderViewer.cpp b/qrenderdoc/Windows/ShaderViewer.cpp index afa5af8e8..2997fd60e 100644 --- a/qrenderdoc/Windows/ShaderViewer.cpp +++ b/qrenderdoc/Windows/ShaderViewer.cpp @@ -1162,12 +1162,21 @@ void ShaderViewer::addFileList() QListWidget *list = new QListWidget(this); list->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); list->setSelectionMode(QAbstractItemView::SingleSelection); - QObject::connect(list, &QListWidget::currentRowChanged, - [this](int idx) { ToolWindowManager::raiseToolWindow(m_Scintillas[idx]); }); + QObject::connect(list, &QListWidget::currentRowChanged, [this](int idx) { + QWidget *raiseWidget = m_Scintillas[idx]; + if(m_Scintillas[idx] == m_DisassemblyView) + raiseWidget = m_DisassemblyFrame; + ToolWindowManager::raiseToolWindow(raiseWidget); + }); list->setWindowTitle(tr("File List")); for(ScintillaEdit *s : m_Scintillas) - list->addItem(s->windowTitle()); + { + if(s == m_DisassemblyView) + list->addItem(m_DisassemblyFrame->windowTitle()); + else + list->addItem(s->windowTitle()); + } ui->docking->addToolWindow( list, ToolWindowManager::AreaReference(ToolWindowManager::LeftOf,