lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-07-08 08:40:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Close floating find windows when pressing escape

Browse Source
This commit is contained in:
baldurk
2021-07-20 15:40:50 +01:00
parent a3a0aae660
commit e182a477b8
3 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Widgets/FindReplace.cpp
+4
View File
@@ -160,6 +160,10 @@ void FindReplace::keyPressEvent(QKeyEvent *event)
m_direction = dir;
}
else
{
emit keyPress(event);
}
}
void FindReplace::addHistory(QComboBox *combo)
qrenderdoc/Widgets/FindReplace.h
+1
View File
@@ -77,6 +77,7 @@ signals:
void performFindAll();
void performReplace();
void performReplaceAll();
void keyPress(QKeyEvent *e);
private slots:
// automatic slots
qrenderdoc/Windows/ShaderViewer.cpp
+17 -4
View File
@@ -110,12 +110,26 @@ ShaderViewer::ShaderViewer(ICaptureContext &ctx, QWidget *parent)
QObject::connect(m_FindReplace, &FindReplace::performReplace, this, &ShaderViewer::performReplace);
QObject::connect(m_FindReplace, &FindReplace::performReplaceAll, this,
&ShaderViewer::performReplaceAll);
QObject::connect(m_FindReplace, &FindReplace::keyPress, [this](QKeyEvent *e) {
if(e->key() == Qt::Key_Escape)
{
// the find replace dialog is the only thing allowed to float. If it's in a floating area,
// hide it on escape
ToolWindowManagerArea *area = ui->docking->areaOf(m_FindReplace);
if(area && ui->docking->isFloating(m_FindReplace))
{
ui->docking->hideToolWindow(m_FindReplace);
}
}
});
ui->docking->addToolWindow(m_FindReplace, ToolWindowManager::NoArea);
ui->docking->setToolWindowProperties(m_FindReplace, ToolWindowManager::HideOnClose);
ui->docking->addToolWindow(m_FindResults, ToolWindowManager::NoArea);
ui->docking->setToolWindowProperties(m_FindResults, ToolWindowManager::HideOnClose);
ui->docking->setToolWindowProperties(
m_FindResults, ToolWindowManager::HideOnClose | ToolWindowManager::DisallowFloatWindow);
{
m_DisassemblyView =
@@ -160,8 +174,6 @@ ShaderViewer::ShaderViewer(ICaptureContext &ctx, QWidget *parent)
ToolWindowManager::AlwaysDisplayFullTabs);
}
ui->docking->setAllowFloatingWindow(false);
{
QMenu *snippetsMenu = new QMenu(this);
@@ -5287,7 +5299,8 @@ void ShaderViewer::performFindAll()
ui->docking->moveToolWindow(m_FindResults,
ToolWindowManager::AreaReference(ToolWindowManager::BottomOf,
ui->docking->areaOf(cur), 0.2f));
ui->docking->setToolWindowProperties(m_FindResults, ToolWindowManager::HideOnClose);
ui->docking->setToolWindowProperties(
m_FindResults, ToolWindowManager::HideOnClose | ToolWindowManager::DisallowFloatWindow);
}
}