From 536dc8f7ab9ec2512b90505a30eb14a4c0a6b4f6 Mon Sep 17 00:00:00 2001 From: Jeffrey Pfau Date: Fri, 21 Oct 2016 02:15:12 -0700 Subject: [PATCH] Qt: Fix centering of sprite preview --- src/platform/qt/ObjView.cpp | 3 ++- src/platform/qt/TilePainter.cpp | 5 ----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/platform/qt/ObjView.cpp b/src/platform/qt/ObjView.cpp index 7d0b6d9c8..e50fe069c 100644 --- a/src/platform/qt/ObjView.cpp +++ b/src/platform/qt/ObjView.cpp @@ -59,11 +59,12 @@ void ObjView::updateTilesGBA(bool force) { unsigned width = GBAVideoObjSizes[shape * 4 + size][0]; unsigned height = GBAVideoObjSizes[shape * 4 + size][1]; m_ui.tiles->setTileCount(width * height / 64); - m_ui.tiles->resize(QSize(width, height) * m_ui.magnification->value()); + m_ui.tiles->setMinimumSize(QSize(width, height) * m_ui.magnification->value()); unsigned palette = GBAObjAttributesCGetPalette(obj->c); unsigned tile = GBAObjAttributesCGetTile(obj->c); int i = 0; // TODO: Tile stride + // TODO: Check to see if parameters are changed (so as to enable force if needed) if (GBAObjAttributesAIs256Color(obj->a)) { mTileCacheSetPalette(m_tileCache.get(), 1); m_ui.tile->setPalette(0); diff --git a/src/platform/qt/TilePainter.cpp b/src/platform/qt/TilePainter.cpp index f83ccf78d..71a019d3c 100644 --- a/src/platform/qt/TilePainter.cpp +++ b/src/platform/qt/TilePainter.cpp @@ -28,11 +28,6 @@ void TilePainter::paintEvent(QPaintEvent* event) { void TilePainter::resizeEvent(QResizeEvent* event) { int w = width() / m_size; - if (w < 1) { - // FIXME: Uhh...how did we get here? - // Resizing the window when magnification > 1 seems to trigger this - return; - } int calculatedHeight = (m_tileCount + w - 1) * m_size / w; calculatedHeight -= calculatedHeight % m_size; if (width() / m_size != m_backing.width() / m_size || m_backing.height() != calculatedHeight) {