From fe8c76154f626e03543bef61441584da42411ef6 Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 1 Jun 2017 14:23:34 +0100 Subject: [PATCH] Draw gridlines in WindowText palette color, not just black --- qrenderdoc/Code/QRDUtils.cpp | 17 +++++++++++------ qrenderdoc/Code/QRDUtils.h | 2 +- .../PipelineState/D3D11PipelineStateViewer.cpp | 6 +++--- .../PipelineState/D3D12PipelineStateViewer.cpp | 6 +++--- .../PipelineState/GLPipelineStateViewer.cpp | 8 ++++---- .../PipelineState/VulkanPipelineStateViewer.cpp | 8 ++++---- 6 files changed, 26 insertions(+), 21 deletions(-) diff --git a/qrenderdoc/Code/QRDUtils.cpp b/qrenderdoc/Code/QRDUtils.cpp index 5fcc27df2..5d0789c65 100644 --- a/qrenderdoc/Code/QRDUtils.cpp +++ b/qrenderdoc/Code/QRDUtils.cpp @@ -513,8 +513,14 @@ bool QFileFilterModel::filterAcceptsRow(int source_row, const QModelIndex &sourc return true; } -void addGridLines(QGridLayout *grid) +void addGridLines(QGridLayout *grid, QColor gridColor) { + QString style = + QFormatStr("border: solid #%1%2%3; border-bottom-width: 1px; border-right-width: 1px;") + .arg(gridColor.red(), 2, 16, QLatin1Char('0')) + .arg(gridColor.green(), 2, 16, QLatin1Char('0')) + .arg(gridColor.blue(), 2, 16, QLatin1Char('0')); + for(int y = 0; y < grid->rowCount(); y++) { for(int x = 0; x < grid->columnCount(); x++) @@ -529,15 +535,14 @@ void addGridLines(QGridLayout *grid) if(w == NULL) continue; - QString style = - lit("border: solid black; border-bottom-width: 1px; border-right-width: 1px;"); + QString cellStyle = style; if(x == 0) - style += lit("border-left-width: 1px;"); + cellStyle += lit("border-left-width: 1px;"); if(y == 0) - style += lit("border-top-width: 1px;"); + cellStyle += lit("border-top-width: 1px;"); - w->setStyleSheet(style); + w->setStyleSheet(cellStyle); } } } diff --git a/qrenderdoc/Code/QRDUtils.h b/qrenderdoc/Code/QRDUtils.h index 7662a4a5c..51bbe128f 100644 --- a/qrenderdoc/Code/QRDUtils.h +++ b/qrenderdoc/Code/QRDUtils.h @@ -872,7 +872,7 @@ struct RDDialog class QGridLayout; -void addGridLines(QGridLayout *grid); +void addGridLines(QGridLayout *grid, QColor gridColor); class QProgressDialog; diff --git a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp index e192e477b..03683fd1f 100644 --- a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.cpp @@ -152,9 +152,9 @@ D3D11PipelineStateViewer::D3D11PipelineStateViewer(ICaptureContext &ctx, QObject::connect(cbuffer, &RDTreeWidget::itemActivated, this, &D3D11PipelineStateViewer::cbuffer_itemActivated); - addGridLines(ui->rasterizerGridLayout); - addGridLines(ui->blendStateGridLayout); - addGridLines(ui->depthStateGridLayout); + addGridLines(ui->rasterizerGridLayout, palette().color(QPalette::WindowText)); + addGridLines(ui->blendStateGridLayout, palette().color(QPalette::WindowText)); + addGridLines(ui->depthStateGridLayout, palette().color(QPalette::WindowText)); { ui->iaLayouts->setColumns({tr("Slot"), tr("Semantic"), tr("Index"), tr("Format"), diff --git a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp index e3e78e287..33600b5b8 100644 --- a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.cpp @@ -181,9 +181,9 @@ D3D12PipelineStateViewer::D3D12PipelineStateViewer(ICaptureContext &ctx, QObject::connect(cbuffer, &RDTreeWidget::itemActivated, this, &D3D12PipelineStateViewer::cbuffer_itemActivated); - addGridLines(ui->rasterizerGridLayout); - addGridLines(ui->blendStateGridLayout); - addGridLines(ui->depthStateGridLayout); + addGridLines(ui->rasterizerGridLayout, palette().color(QPalette::WindowText)); + addGridLines(ui->blendStateGridLayout, palette().color(QPalette::WindowText)); + addGridLines(ui->depthStateGridLayout, palette().color(QPalette::WindowText)); { ui->iaLayouts->setColumns({tr("Slot"), tr("Semantic"), tr("Index"), tr("Format"), diff --git a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp index 08b08e7a7..6f573936f 100644 --- a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp @@ -158,10 +158,10 @@ GLPipelineStateViewer::GLPipelineStateViewer(ICaptureContext &ctx, PipelineState QObject::connect(res, &RDTreeWidget::itemActivated, this, &GLPipelineStateViewer::resource_itemActivated); - addGridLines(ui->rasterizerGridLayout); - addGridLines(ui->MSAAGridLayout); - addGridLines(ui->blendStateGridLayout); - addGridLines(ui->depthStateGridLayout); + addGridLines(ui->rasterizerGridLayout, palette().color(QPalette::WindowText)); + addGridLines(ui->MSAAGridLayout, palette().color(QPalette::WindowText)); + addGridLines(ui->blendStateGridLayout, palette().color(QPalette::WindowText)); + addGridLines(ui->depthStateGridLayout, palette().color(QPalette::WindowText)); { ui->viAttrs->setColumns({tr("Index"), tr("Enabled"), tr("Name"), tr("Format/Generic Value"), diff --git a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp index 2ea7525a8..7e94193f2 100644 --- a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.cpp @@ -158,10 +158,10 @@ VulkanPipelineStateViewer::VulkanPipelineStateViewer(ICaptureContext &ctx, QObject::connect(ubo, &RDTreeWidget::itemActivated, this, &VulkanPipelineStateViewer::ubo_itemActivated); - addGridLines(ui->rasterizerGridLayout); - addGridLines(ui->MSAAGridLayout); - addGridLines(ui->blendStateGridLayout); - addGridLines(ui->depthStateGridLayout); + addGridLines(ui->rasterizerGridLayout, palette().color(QPalette::WindowText)); + addGridLines(ui->MSAAGridLayout, palette().color(QPalette::WindowText)); + addGridLines(ui->blendStateGridLayout, palette().color(QPalette::WindowText)); + addGridLines(ui->depthStateGridLayout, palette().color(QPalette::WindowText)); { ui->viAttrs->setColumns({tr("Index"), tr("Name"), tr("Location"), tr("Binding"), tr("Format"),