From 870d553a38dff411bc7dbe17d45ac784bed8b81e Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 22 Apr 2019 10:17:33 +0100 Subject: [PATCH] setPixmap can clear text, when removing pixmap do so before setting text --- .../Windows/PipelineState/GLPipelineStateViewer.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp index 9b9557176..5dc279c87 100644 --- a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp +++ b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.cpp @@ -641,8 +641,8 @@ void GLPipelineStateViewer::clearState() ui->depthFunc->setText(lit("GREATER_EQUAL")); ui->depthWrite->setPixmap(tick); - ui->depthBounds->setText(lit("0.0-1.0")); ui->depthBounds->setPixmap(QPixmap()); + ui->depthBounds->setText(lit("0.0-1.0")); ui->stencils->clear(); } @@ -1737,8 +1737,8 @@ void GLPipelineStateViewer::setState() } else { - ui->offsetClamp->setText(Formatter::Format(state.rasterizer.state.offsetClamp)); ui->offsetClamp->setPixmap(QPixmap()); + ui->offsetClamp->setText(Formatter::Format(state.rasterizer.state.offsetClamp)); } ui->multisample->setPixmap(state.rasterizer.state.multisampleEnable ? tick : cross); @@ -1751,8 +1751,8 @@ void GLPipelineStateViewer::setState() QString sampleCoverage = Formatter::Format(state.rasterizer.state.sampleCoverageValue); if(state.rasterizer.state.sampleCoverageInvert) sampleCoverage += tr(" inverted"); - ui->sampleCoverage->setText(sampleCoverage); ui->sampleCoverage->setPixmap(QPixmap()); + ui->sampleCoverage->setText(sampleCoverage); } else { @@ -1762,8 +1762,8 @@ void GLPipelineStateViewer::setState() if(state.rasterizer.state.sampleMask) { - ui->sampleMask->setText(Formatter::Format(state.rasterizer.state.sampleMaskValue, true)); ui->sampleMask->setPixmap(QPixmap()); + ui->sampleMask->setText(Formatter::Format(state.rasterizer.state.sampleMaskValue, true)); } else { @@ -2041,9 +2041,9 @@ void GLPipelineStateViewer::setState() if(state.depthState.depthBounds) { + ui->depthBounds->setPixmap(QPixmap()); ui->depthBounds->setText(Formatter::Format(state.depthState.nearBound) + lit("-") + Formatter::Format(state.depthState.farBound)); - ui->depthBounds->setPixmap(QPixmap()); } else {