lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-12 21:10:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix cases where find results or file list were breaking

Browse Source 
* The change to make the disassembly view not directly a child of a
  DockContent but instead a table layout (to add the disassembly type
  drop-down) were causing some casts of 'thing.Parent' to fail.
This commit is contained in:
baldurk
2017-08-14 11:18:11 +01:00
parent 11a47bfbe4
commit 643edbe8a7
1 changed files with 44 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdocui/Windows/ShaderViewer.cs
+44 -21
View File
@@ -575,21 +575,10 @@ namespace renderdocui.Windows
AddFileList();
if (trace != null || sel == null)
{
Control p = m_DisassemblyView.Parent;
while (p != null)
{
if (p is DockContent)
{
sel = (DockContent)p;
break;
}
sel = DockContentFor(m_DisassemblyView);
p = p.Parent;
}
}
sel.Show();
if(sel != null)
sel.Show();
}
ShowConstants();
@@ -712,7 +701,11 @@ namespace renderdocui.Windows
int idx = m_FileList.SelectedIndex;
if (idx >= 0 && idx < m_Scintillas.Count)
(m_Scintillas[idx].Parent as DockContent).Show();
{
DockContent dock = DockContentFor(m_Scintillas[idx]);
if (dock != null)
dock.Show();
}
}
private void AddFileList()
@@ -727,7 +720,11 @@ namespace renderdocui.Windows
m_FileList.SelectedIndexChanged += new EventHandler(list_SelectedIndexChanged);
foreach (ScintillaNET.Scintilla s in m_Scintillas)
m_FileList.Items.Add((s.Parent as DockContent).Text);
{
DockContent dock = DockContentFor(s);
if(dock != null)
m_FileList.Items.Add(dock.Text);
}
var w = Helpers.WrapDockContent(dockPanel, m_FileList, "File List");
w.DockState = DockState.DockLeft;
@@ -839,7 +836,11 @@ namespace renderdocui.Windows
w.DockAreas |= DockAreas.Float;
w.DockState = DockState.DockBottom;
w.HideOnClose = true;
w.Show((m_Scintillas[0].Parent as DockContent).Pane, DockAlignment.Bottom, 0.5);
DockContent dock = DockContentFor(m_Scintillas[0]);
if(dock != null)
w.Show(dock.Pane, DockAlignment.Bottom, 0.5);
else
w.Show();
}
else
{
@@ -886,7 +887,11 @@ namespace renderdocui.Windows
foreach (var kv in findResultsByEd)
{
string filename = (kv.Key.Parent as DockContent).Text;
DockContent dock = DockContentFor(kv.Key);
if (dock == null)
continue;
string filename = dock.Text;
if (kv.Value.Count > 0)
fileCount++;
@@ -935,10 +940,13 @@ namespace renderdocui.Windows
int idx = line - 1;
DockContent dc = (m_FindResults[idx].Key.Parent as DockContent);
DockContent dc = DockContentFor(m_FindResults[idx].Key);
dc.Activate();
dc.Show();
if (dc != null)
{
dc.Activate();
dc.Show();
}
m_FindResults[idx].Key.GoTo.Line(m_FindResults[idx].Value.StartingLine.Number);
@@ -2391,5 +2399,20 @@ namespace renderdocui.Windows
{
ShowFindAll();
}
private DockContent DockContentFor(Control c)
{
Control p = c.Parent;
while (p != null)
{
if (p is DockContent)
return (DockContent)p;
p = p.Parent;
}
return null;
}
}
}