From 844f080300caf4218492fa8fa1a647e5a1fbae62 Mon Sep 17 00:00:00 2001 From: baldurk Date: Sun, 13 Jul 2014 16:28:09 +0100 Subject: [PATCH] Change priority of node background colours, so select colour works --- renderdocui/Controls/TreeListView/TreeListPainter.cs | 10 +++++----- renderdocui/Windows/PixelHistoryView.cs | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/renderdocui/Controls/TreeListView/TreeListPainter.cs b/renderdocui/Controls/TreeListView/TreeListPainter.cs index 36e563593..026edf14b 100644 --- a/renderdocui/Controls/TreeListView/TreeListPainter.cs +++ b/renderdocui/Controls/TreeListView/TreeListPainter.cs @@ -199,17 +199,17 @@ namespace TreelistView if (format.BackColor != Color.Transparent) c = format.BackColor; + if (!m_owner.NodesSelection.Contains(node) && m_owner.FocusedNode != node && + !(hoverNode == node && m_owner.RowOptions.HoverHighlight) && + node.DefaultBackColor != Color.Transparent) + c = node.DefaultBackColor; + if (node.BackColor != Color.Transparent) c = node.BackColor; if (column.Index < node.IndexedBackColor.Length && node.IndexedBackColor[column.Index] != Color.Transparent) c = node.IndexedBackColor[column.Index]; - if (!m_owner.NodesSelection.Contains(node) && m_owner.FocusedNode != node && - !(hoverNode == node && m_owner.RowOptions.HoverHighlight) && - node.DefaultBackColor != Color.Transparent) - c = node.DefaultBackColor; - if (c != Color.Transparent) { Rectangle r = cellRect; diff --git a/renderdocui/Windows/PixelHistoryView.cs b/renderdocui/Windows/PixelHistoryView.cs index 1ec57752a..84cab4413 100644 --- a/renderdocui/Windows/PixelHistoryView.cs +++ b/renderdocui/Windows/PixelHistoryView.cs @@ -142,7 +142,7 @@ namespace renderdocui.Windows var node = events.Nodes.Add(new object[] { mod.eventID, name, preModVal, "", postModVal, "" }); - node.BackColor = passed ? Color.FromArgb(235, 255, 235) : Color.FromArgb(255, 235, 235); + node.DefaultBackColor = passed ? Color.FromArgb(235, 255, 235) : Color.FromArgb(255, 235, 235); if (floatTex) {