diff --git a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp index 1d8d2f229..7876fcb64 100644 --- a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp @@ -664,10 +664,7 @@ void D3D11PipelineStateViewer::setViewDetails(RDTreeWidgetItem *node, const D3D1 node->setToolTip(text); if(viewdetails) - { - node->setBackgroundColor(QColor(127, 255, 212)); - node->setForegroundColor(QColor(0, 0, 0)); - } + node->setBackgroundColor(m_Common.GetViewDetailsColor()); } void D3D11PipelineStateViewer::setViewDetails(RDTreeWidgetItem *node, const D3D11ViewTag &view, @@ -697,8 +694,7 @@ void D3D11PipelineStateViewer::setViewDetails(RDTreeWidgetItem *node, const D3D1 } node->setToolTip(text); - node->setBackgroundColor(QColor(127, 255, 212)); - node->setForegroundColor(QColor(0, 0, 0)); + node->setBackgroundColor(m_Common.GetViewDetailsColor()); } void D3D11PipelineStateViewer::addResourceRow(const D3D11ViewTag &view, diff --git a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp index fe1558301..d8d7a5e0a 100644 --- a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp @@ -678,10 +678,7 @@ void D3D12PipelineStateViewer::setViewDetails(RDTreeWidgetItem *node, const D3D1 node->setToolTip(text); if(viewdetails) - { - node->setBackgroundColor(QColor(127, 255, 212)); - node->setForegroundColor(QColor(0, 0, 0)); - } + node->setBackgroundColor(m_Common.GetViewDetailsColor()); } void D3D12PipelineStateViewer::setViewDetails(RDTreeWidgetItem *node, const D3D12ViewTag &view, @@ -723,10 +720,7 @@ void D3D12PipelineStateViewer::setViewDetails(RDTreeWidgetItem *node, const D3D1 node->setToolTip(text); if(viewdetails) - { - node->setBackgroundColor(QColor(127, 255, 212)); - node->setForegroundColor(QColor(0, 0, 0)); - } + node->setBackgroundColor(m_Common.GetViewDetailsColor()); } void D3D12PipelineStateViewer::addResourceRow(const D3D12ViewTag &view, const Bindpoint *bind, diff --git a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp index 50d38a216..cda37b807 100644 --- a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp @@ -570,9 +570,7 @@ void GLPipelineStateViewer::setViewDetails(RDTreeWidgetItem *node, TextureDescri if(!text.isEmpty()) { node->setToolTip(text); - - node->setBackgroundColor(QColor(127, 255, 212)); - node->setForegroundColor(QColor(0, 0, 0)); + node->setBackgroundColor(m_Common.GetViewDetailsColor()); } } diff --git a/qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp index 0ffbad8ba..e0804b4e3 100644 --- a/qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/PipelineStateViewer.cpp @@ -1498,6 +1498,12 @@ QString PipelineStateViewer::GetVBufferFormatString(uint32_t slot) return format; } +QColor PipelineStateViewer::GetViewDetailsColor() +{ + return QColor::fromHslF(0.45f, 1.0f, + qBound(0.25, palette().color(QPalette::Base).lightnessF(), 0.75)); +} + bool PipelineStateViewer::SaveShaderFile(const ShaderReflection *shader) { if(!shader) diff --git a/qrenderdoc/Windows/PipelineState/PipelineStateViewer.h b/qrenderdoc/Windows/PipelineState/PipelineStateViewer.h index 0e1fc82a5..c6e629b32 100644 --- a/qrenderdoc/Windows/PipelineState/PipelineStateViewer.h +++ b/qrenderdoc/Windows/PipelineState/PipelineStateViewer.h @@ -109,6 +109,8 @@ public: QString GetVBufferFormatString(uint32_t slot); + QColor GetViewDetailsColor(); + void setTopologyDiagram(QLabel *diagram, Topology topo); void setMeshViewPixmap(RDLabel *meshView); diff --git a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp index 4ebfa58c7..80daa2a7c 100644 --- a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp @@ -703,8 +703,7 @@ bool VulkanPipelineStateViewer::setViewDetails(RDTreeWidgetItem *node, const bin if(viewdetails && stageBitsIncluded) { - node->setBackgroundColor(QColor(127, 255, 212)); - node->setForegroundColor(QColor(0, 0, 0)); + node->setBackgroundColor(m_Common.GetViewDetailsColor()); } return viewdetails; @@ -737,10 +736,7 @@ bool VulkanPipelineStateViewer::setViewDetails(RDTreeWidgetItem *node, const bin node->setToolTip(text); if(stageBitsIncluded) - { - node->setBackgroundColor(QColor(127, 255, 212)); - node->setForegroundColor(QColor(0, 0, 0)); - } + node->setBackgroundColor(m_Common.GetViewDetailsColor()); return true; }