From 220e214f4d3ea999e74c55cf63269dde88cbd8a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matth=C3=A4us=20G=2E=20Chajdas?= Date: Wed, 28 Sep 2016 15:54:26 +0200 Subject: [PATCH] Improve range display on group tree nodes in EventBrowser. In the event browser, the tree nodes which can be expanded are always showing a range (17-17) even if the range is a single item. This fix changes that to 17. --- renderdocui/Windows/EventBrowser.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/renderdocui/Windows/EventBrowser.cs b/renderdocui/Windows/EventBrowser.cs index 5b28a8778..cbed26e3d 100644 --- a/renderdocui/Windows/EventBrowser.cs +++ b/renderdocui/Windows/EventBrowser.cs @@ -233,7 +233,9 @@ namespace renderdocui.Windows private TreelistView.Node MakeNode(UInt32 minEID, UInt32 maxEID, UInt32 minDraw, UInt32 maxDraw, string text, double duration) { - return new TreelistView.Node(new object[] { String.Format("{0}-{1}", minEID, maxEID), String.Format("{0}-{1}", minDraw, maxDraw), text.Replace("&", "&&"), duration }); + string eidString = (maxEID == minEID) ? maxEID.ToString() : String.Format("{0}-{1}", minEID, maxEID); + string drawString = (maxDraw == minDraw) ? maxDraw.ToString() : String.Format("{0}-{1}", minDraw, maxDraw); + return new TreelistView.Node(new object[] {eidString, drawString, text.Replace("&", "&&"), duration }); } private TreelistView.Node MakeNode(UInt32 EID, UInt32 draw, string text, double duration) @@ -612,8 +614,8 @@ namespace renderdocui.Windows private int FindEvent(TreelistView.NodeCollection nodes, string filter, UInt32 after, bool forward) { - if(nodes == null) return -1; - + if(nodes == null) return -1; + for (int i = forward ? 0 : nodes.Count - 1; i >= 0 && i < nodes.Count; i += forward ? 1 : -1)