lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-23 06:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't leak menus by creating every time the callback is called

Browse Source
This commit is contained in:
baldurk
2017-02-17 12:29:11 +00:00
parent b6f62d030f
commit 079dcf2e24
1 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Windows/BufferViewer.cpp
+25 -19
View File
@@ -761,52 +761,58 @@ BufferViewer::BufferViewer(CaptureContext &ctx, bool meshview, QWidget *parent)
ui->vsoutData->setContextMenuPolicy(Qt::CustomContextMenu);
ui->gsoutData->setContextMenuPolicy(Qt::CustomContextMenu);
QMenu *vsinMenu = new QMenu(this);
QObject::connect(ui->vsinData, &RDTableView::customContextMenuRequested,
[this, debug, csv, bytes](const QPoint &pos) {
[this, vsinMenu, debug, csv, bytes](const QPoint &pos) {
m_CurView = ui->vsinData;
QMenu *menu = new QMenu(this);
vsinMenu->clear();
if(m_MeshView)
{
menu->addAction(debug);
menu->addSeparator();
vsinMenu->addAction(debug);
vsinMenu->addSeparator();
}
menu->addAction(csv);
menu->addAction(bytes);
vsinMenu->addAction(csv);
vsinMenu->addAction(bytes);
menu->popup(ui->vsinData->viewport()->mapToGlobal(pos));
vsinMenu->popup(ui->vsinData->viewport()->mapToGlobal(pos));
});
QMenu *vsoutMenu = new QMenu(this);
QObject::connect(ui->vsoutData, &RDTableView::customContextMenuRequested,
[this, debug, csv, bytes](const QPoint &pos) {
[this, vsoutMenu, debug, csv, bytes](const QPoint &pos) {
m_CurView = ui->vsoutData;
QMenu *menu = new QMenu(this);
vsoutMenu->clear();
if(m_MeshView)
{
menu->addAction(debug);
menu->addSeparator();
vsoutMenu->addAction(debug);
vsoutMenu->addSeparator();
}
menu->addAction(csv);
menu->addAction(bytes);
vsoutMenu->addAction(csv);
vsoutMenu->addAction(bytes);
menu->popup(ui->vsoutData->viewport()->mapToGlobal(pos));
vsoutMenu->popup(ui->vsoutData->viewport()->mapToGlobal(pos));
});
QMenu *gsoutMenu = new QMenu(this);
QObject::connect(ui->gsoutData, &RDTableView::customContextMenuRequested,
[this, csv, bytes](const QPoint &pos) {
[this, gsoutMenu, csv, bytes](const QPoint &pos) {
m_CurView = ui->gsoutData;
QMenu *menu = new QMenu(this);
gsoutMenu->clear();
menu->addAction(csv);
menu->addAction(bytes);
gsoutMenu->addAction(csv);
gsoutMenu->addAction(bytes);
menu->popup(ui->gsoutData->viewport()->mapToGlobal(pos));
gsoutMenu->popup(ui->gsoutData->viewport()->mapToGlobal(pos));
});
ui->dockarea->setAllowFloatingWindow(false);