mirror of
https://github.com/baldurk/renderdoc.git
synced 2026-11-08 06:53:41 +00:00
Draw gridlines in WindowText palette color, not just black
This commit is contained in:
1 parent
5c877ae1ae
commit
fe8c76154f
6 files changed
+26
-21
No files matched your search
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -872,7 +872,7 @@ struct RDDialog
|
||||
|
||||
class QGridLayout;
|
||||
|
||||
void addGridLines(QGridLayout *grid);
|
||||
void addGridLines(QGridLayout *grid, QColor gridColor);
|
||||
|
||||
class QProgressDialog;
|
||||
|
||||
|
||||
@@ -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"),
|
||||
|
||||
@@ -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"),
|
||||
|
||||
@@ -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"),
|
||||
|
||||
@@ -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"),
|
||||
|
||||
Reference in new issue
Block a user