fix(gui): "lay flat" vtf preview mode ignores alpha transparency checkbox

craftablescience · craftablescience · commit 8b0c6dd7ae62 · 2024-06-06T13:08:45.000-04:00
diff --git a/src/gui/previews/VTFPreview.cpp b/src/gui/previews/VTFPreview.cpp
@@ -218,7 +218,7 @@ void VTFWidget::paintEvent(QPaintEvent*) {
 				if (!imageData.empty()) {
 					QImage currentImage(reinterpret_cast<uchar*>(imageData.data()), static_cast<int>(this->vtf->getWidth(this->currentMip)), static_cast<int>(this->vtf->getHeight(this->currentMip)), QImage::Format_RGBA8888);
 					if (!this->alphaEnabled) {
-						this->image = this->image.convertedTo(QImage::Format_RGB888);
+						currentImage = currentImage.convertedTo(QImage::Format_RGB888);
 					}
 					painter.drawImage(QRect(zoomedXPos + (zoomedWidth * face) - (totalZoomedWidth / 2), zoomedYPos + (zoomedHeight * frame) - (totalZoomedHeight / 2), zoomedWidth, zoomedHeight), currentImage, sourceRect);
 				}

Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ void VTFWidget::paintEvent(QPaintEvent*) {`
`218`	`218`	`if (!imageData.empty()) {`
`219`	`219`	`QImage currentImage(reinterpret_cast<uchar*>(imageData.data()), static_cast<int>(this->vtf->getWidth(this->currentMip)), static_cast<int>(this->vtf->getHeight(this->currentMip)), QImage::Format_RGBA8888);`
`220`	`220`	`if (!this->alphaEnabled) {`
`221`		`- this->image = this->image.convertedTo(QImage::Format_RGB888);`
	`221`	`+ currentImage = currentImage.convertedTo(QImage::Format_RGB888);`
`222`	`222`	`}`
`223`	`223`	`painter.drawImage(QRect(zoomedXPos + (zoomedWidth * face) - (totalZoomedWidth / 2), zoomedYPos + (zoomedHeight * frame) - (totalZoomedHeight / 2), zoomedWidth, zoomedHeight), currentImage, sourceRect);`
`224`	`224`	`}`