From f769c9cd72faa1a15a71f80cca991543e9c37af9 Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 26 Jun 2015 19:06:23 +0200 Subject: [PATCH] Make debug keys (F10, F5 etc) work while register/watch windows focussed --- renderdocui/Windows/ShaderViewer.Designer.cs | 3 +++ renderdocui/Windows/ShaderViewer.cs | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/renderdocui/Windows/ShaderViewer.Designer.cs b/renderdocui/Windows/ShaderViewer.Designer.cs index 65d98e021..6d869ad3e 100644 --- a/renderdocui/Windows/ShaderViewer.Designer.cs +++ b/renderdocui/Windows/ShaderViewer.Designer.cs @@ -153,6 +153,7 @@ this.variableRegs.Size = new System.Drawing.Size(183, 169); this.variableRegs.TabIndex = 1; this.variableRegs.Text = "treeListView1"; + this.variableRegs.KeyDown += new System.Windows.Forms.KeyEventHandler(this.DebugKeys_KeyDown); this.variableRegs.Leave += new System.EventHandler(this.regsList_Leave); this.variableRegs.MouseMove += new System.Windows.Forms.MouseEventHandler(this.regsList_MouseMove); // @@ -188,6 +189,7 @@ this.constantRegs.Size = new System.Drawing.Size(226, 171); this.constantRegs.TabIndex = 0; this.constantRegs.Text = "treeListView1"; + this.constantRegs.KeyDown += new System.Windows.Forms.KeyEventHandler(this.DebugKeys_KeyDown); this.constantRegs.Leave += new System.EventHandler(this.regsList_Leave); this.constantRegs.MouseMove += new System.Windows.Forms.MouseEventHandler(this.regsList_MouseMove); // @@ -627,6 +629,7 @@ this.watchRegs.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.watchRegs_AfterLabelEdit); this.watchRegs.Click += new System.EventHandler(this.watchRegs_Click); this.watchRegs.DoubleClick += new System.EventHandler(this.watchRegs_DoubleClick); + this.watchRegs.KeyDown += new System.Windows.Forms.KeyEventHandler(this.DebugKeys_KeyDown); this.watchRegs.KeyUp += new System.Windows.Forms.KeyEventHandler(this.watchRegs_KeyUp); this.watchRegs.Layout += new System.Windows.Forms.LayoutEventHandler(this.watchRegs_Layout); this.watchRegs.Leave += new System.EventHandler(this.regsList_Leave); diff --git a/renderdocui/Windows/ShaderViewer.cs b/renderdocui/Windows/ShaderViewer.cs index 32b1018ca..f026c18e2 100644 --- a/renderdocui/Windows/ShaderViewer.cs +++ b/renderdocui/Windows/ShaderViewer.cs @@ -1360,6 +1360,14 @@ namespace renderdocui.Windows } void m_DisassemblyView_KeyDown(object sender, KeyEventArgs e) + { + if (m_Trace == null || m_Trace.states == null) + return; + + DebugKeys_KeyDown(sender, e); + } + + void DebugKeys_KeyDown(object sender, KeyEventArgs e) { if (m_Trace == null || m_Trace.states == null) return;