From d6706a9c4836c6a96398bb9a14f85502661eb092 Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 14 Aug 2018 17:39:13 +0100 Subject: [PATCH] Don't allow resource previews to have negative sizes * This isn't a real bug, it only happens temporarily during first show of a window while the geometry is all messed up, but it causes some error spam in the log so it's better to fix. --- qrenderdoc/Widgets/ThumbnailStrip.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qrenderdoc/Widgets/ThumbnailStrip.cpp b/qrenderdoc/Widgets/ThumbnailStrip.cpp index dbc4ad641..669d51099 100644 --- a/qrenderdoc/Widgets/ThumbnailStrip.cpp +++ b/qrenderdoc/Widgets/ThumbnailStrip.cpp @@ -119,9 +119,9 @@ void ThumbnailStrip::refreshLayout() QScrollBar *hs = ui->scrollArea->horizontalScrollBar(); - avail.setHeight(avail.height() - hs->geometry().height()); + avail.setHeight(qMax(1, avail.height() - hs->geometry().height())); - aspectWidth = (int)((float)avail.height() * 1.3f); + aspectWidth = qMax(1, (int)((float)avail.height() * 1.3f)); int totalWidth = numActive * (aspectWidth + 20); hs->setEnabled(totalWidth > avail.width()); @@ -161,9 +161,9 @@ void ThumbnailStrip::refreshLayout() QScrollBar *vs = ui->scrollArea->verticalScrollBar(); - avail.setWidth(avail.width() - vs->geometry().width()); + avail.setWidth(qMax(1, avail.width() - vs->geometry().width())); - aspectHeight = (int)((float)avail.width() / 1.3f); + aspectHeight = qMax(1, (int)((float)avail.width() / 1.3f)); int totalHeight = numActive * (aspectHeight + 6); vs->setEnabled(totalHeight > avail.height());