From 0e39b958c007ab2b1ddca80811b8b5309468431d Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Fri, 15 Mar 2019 23:09:00 -0700 Subject: [PATCH] Qt: Fix saved scale not getting set on resize (fixes #1074) --- CHANGES | 1 + src/platform/qt/Window.cpp | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 60ef4ca59..ab50718ca 100644 --- a/CHANGES +++ b/CHANGES @@ -9,6 +9,7 @@ Other fixes: - Qt: Fix load recent from archive (fixes mgba.io/i/1325) - LR35902: Fix disassembly of several CB-prefix instructions - Qt: Fix overrides getting discarded (fixes mgba.io/i/1354) + - Qt: Fix saved scale not getting set on resize (fixes mgba.io/i/1074) Misc: - Qt: Add missing HEVC NVENC option (fixes mgba.io/i/1323) - Qt: Improve camera initialization diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp index a28935668..18c2eba2c 100644 --- a/src/platform/qt/Window.cpp +++ b/src/platform/qt/Window.cpp @@ -571,9 +571,8 @@ void Window::resizeEvent(QResizeEvent* event) { if (m_screenWidget->width() % size.width() == 0 && m_screenWidget->height() % size.height() == 0 && m_screenWidget->width() / size.width() == m_screenWidget->height() / size.height()) { factor = m_screenWidget->width() / size.width(); - } else { - m_savedScale = 0; } + m_savedScale = factor; for (QMap::iterator iter = m_frameSizes.begin(); iter != m_frameSizes.end(); ++iter) { bool enableSignals = iter.value()->blockSignals(true); iter.value()->setChecked(iter.key() == factor);