mirror of https://github.com/mgba-emu/mgba.git
Qt: Fix window resizing when no game is loaded
This commit is contained in:
parent
a999a87607
commit
e8e6b803f2
|
@ -1523,10 +1523,18 @@ void Window::setupMenu(QMenuBar* menubar) {
|
||||||
auto setSize = m_actions.addAction(tr("%1×").arg(QString::number(i)), QString("frame.%1x").arg(QString::number(i)), [this, i]() {
|
auto setSize = m_actions.addAction(tr("%1×").arg(QString::number(i)), QString("frame.%1x").arg(QString::number(i)), [this, i]() {
|
||||||
auto setSize = m_frameSizes[i];
|
auto setSize = m_frameSizes[i];
|
||||||
showNormal();
|
showNormal();
|
||||||
QSize size(GBA_VIDEO_HORIZONTAL_PIXELS, GBA_VIDEO_VERTICAL_PIXELS);
|
#if defined(M_CORE_GBA)
|
||||||
|
QSize minimumSize = QSize(GBA_VIDEO_HORIZONTAL_PIXELS, GBA_VIDEO_VERTICAL_PIXELS);
|
||||||
|
#elif defined(M_CORE_GB)
|
||||||
|
QSize minimumSize = QSize(GB_VIDEO_HORIZONTAL_PIXELS, GB_VIDEO_VERTICAL_PIXELS);
|
||||||
|
#endif
|
||||||
|
QSize size;
|
||||||
if (m_display) {
|
if (m_display) {
|
||||||
size = m_display->contentSize();
|
size = m_display->contentSize();
|
||||||
}
|
}
|
||||||
|
if (size.isNull()) {
|
||||||
|
size = minimumSize;
|
||||||
|
}
|
||||||
size *= i;
|
size *= i;
|
||||||
m_savedScale = i;
|
m_savedScale = i;
|
||||||
m_config->setOption("scaleMultiplier", i); // TODO: Port to other
|
m_config->setOption("scaleMultiplier", i); // TODO: Port to other
|
||||||
|
|
Loading…
Reference in New Issue