From 99a063858bb432bccd02d8482ade56258b65bae7 Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Tue, 30 Apr 2019 18:16:44 -0700
Subject: [PATCH] Qt: Fix adjusting magnification in tile viewer when not
 fitting to window

---
 CHANGES                      | 1 +
 src/platform/qt/TileView.cpp | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index fbf490aca..167d7a0c4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -18,6 +18,7 @@ Other fixes:
  - GB Core: Fix toggling WIN and OBJ being swapped
  - All: Fix several memory leaks
  - LR35902: Fix trailing whitespace in disassembly
+ - Qt: Fix adjusting magnification in tile viewer when not fitting to window
 Misc:
  - Qt: Add missing HEVC NVENC option (fixes mgba.io/i/1323)
  - Qt: Improve camera initialization
diff --git a/src/platform/qt/TileView.cpp b/src/platform/qt/TileView.cpp
index bc7381f7a..01673c9df 100644
--- a/src/platform/qt/TileView.cpp
+++ b/src/platform/qt/TileView.cpp
@@ -65,7 +65,10 @@ TileView::TileView(std::shared_ptr<CoreController> controller, QWidget* parent)
 		}
 		updateTiles(true);
 	});
-	connect(m_ui.magnification, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), [this]() {
+	connect(m_ui.magnification, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), [this](int mag) {
+		if (!m_ui.tileFit->isChecked()) {
+			m_ui.tiles->setMinimumSize(mag * 8 * m_ui.tilesPerRow->value(), m_ui.tiles->minimumSize().height());
+		}
 		updateTiles(true);
 	});