From 3a8fecf08e9d641d02c7faf863c9b8540ca5d6f7 Mon Sep 17 00:00:00 2001 From: Jake Turner Date: Tue, 9 Apr 2024 09:01:20 +0100 Subject: [PATCH] Prevent Shader Editor tooltip showing multiple "(F5)" --- qrenderdoc/Windows/ShaderViewer.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/qrenderdoc/Windows/ShaderViewer.cpp b/qrenderdoc/Windows/ShaderViewer.cpp index ec08a3bb5..be8ca3459 100644 --- a/qrenderdoc/Windows/ShaderViewer.cpp +++ b/qrenderdoc/Windows/ShaderViewer.cpp @@ -320,12 +320,6 @@ void ShaderViewer::editShader(ResourceId id, ShaderStage stage, const QString &e MarkModification(); }); - - m_Ctx.GetMainWindow()->RegisterShortcut(QKeySequence(QKeySequence::Refresh).toString(), this, - [this](QWidget *) { on_refresh_clicked(); }); - ui->refresh->setToolTip(ui->refresh->toolTip() + - lit(" (%1)").arg(QKeySequence(QKeySequence::Refresh).toString())); - QWidget *w = (QWidget *)scintilla; w->setProperty("filename", kv.first); w->setProperty("origText", kv.second); @@ -338,6 +332,11 @@ void ShaderViewer::editShader(ResourceId id, ShaderStage stage, const QString &e } } + m_Ctx.GetMainWindow()->RegisterShortcut(QKeySequence(QKeySequence::Refresh).toString(), this, + [this](QWidget *) { on_refresh_clicked(); }); + ui->refresh->setToolTip(ui->refresh->toolTip() + + lit(" (%1)").arg(QKeySequence(QKeySequence::Refresh).toString())); + if(sel != NULL) ToolWindowManager::raiseToolWindow(sel);