ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Simplify display sizing

This commit is contained in:
Vicki Pfau 2018-03-10 17:37:29 -08:00
parent 351774ec2f
commit d22315cba5
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/platform/qt/Display.cpp
View File

@ -8,12 +8,6 @@
#include "DisplayGL.h" #include "DisplayGL.h"
#include "DisplayQt.h" #include "DisplayQt.h"
#ifdef M_CORE_GB
#include <mgba/internal/gb/video.h>
#elif defined(M_CORE_GBA)
#include <mgba/internal/gba/video.h>
#endif
using namespace QGBA; using namespace QGBA;
#if defined(BUILD_GL) || defined(BUILD_GLES2) || defined(USE_EPOXY) #if defined(BUILD_GL) || defined(BUILD_GLES2) || defined(USE_EPOXY)
@ -55,11 +49,6 @@ Display::Display(QWidget* parent)
: QWidget(parent) : QWidget(parent)
{ {
setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
#ifdef M_CORE_GB
setMinimumSize(GB_VIDEO_HORIZONTAL_PIXELS, GB_VIDEO_VERTICAL_PIXELS);
#elif defined(M_CORE_GBA)
setMinimumSize(VIDEO_HORIZONTAL_PIXELS, VIDEO_VERTICAL_PIXELS);
#endif
connect(&m_mouseTimer, &QTimer::timeout, this, &Display::hideCursor); connect(&m_mouseTimer, &QTimer::timeout, this, &Display::hideCursor);
m_mouseTimer.setSingleShot(true); m_mouseTimer.setSingleShot(true);
m_mouseTimer.setInterval(MOUSE_DISAPPEAR_TIMER); m_mouseTimer.setInterval(MOUSE_DISAPPEAR_TIMER);

14
src/platform/qt/Window.cpp
View File

@ -668,8 +668,6 @@ void Window::gameStarted() {
multiplayerChanged(); multiplayerChanged();
updateTitle(); updateTitle();
QSize size = m_controller->screenDimensions(); QSize size = m_controller->screenDimensions();
m_display->setMinimumSize(size);
m_screenWidget->setMinimumSize(m_display->minimumSize());
m_screenWidget->setDimensions(size.width(), size.height()); m_screenWidget->setDimensions(size.width(), size.height());
m_config->updateOption("lockIntegerScaling"); m_config->updateOption("lockIntegerScaling");
m_config->updateOption("lockAspectRatio"); m_config->updateOption("lockAspectRatio");
@ -677,6 +675,7 @@ void Window::gameStarted() {
resizeFrame(size * m_savedScale); resizeFrame(size * m_savedScale);
} }
attachWidget(m_display.get()); attachWidget(m_display.get());
m_display->setMinimumSize(size);
#ifndef Q_OS_MAC #ifndef Q_OS_MAC
if (isFullScreen()) { if (isFullScreen()) {
@ -751,7 +750,6 @@ void Window::gameStopped() {
#elif defined(M_CORE_GBA) #elif defined(M_CORE_GBA)
m_display->setMinimumSize(VIDEO_HORIZONTAL_PIXELS, VIDEO_VERTICAL_PIXELS); m_display->setMinimumSize(VIDEO_HORIZONTAL_PIXELS, VIDEO_VERTICAL_PIXELS);
#endif #endif
m_screenWidget->setMinimumSize(m_display->minimumSize());
m_videoLayers->clear(); m_videoLayers->clear();
m_audioChannels->clear(); m_audioChannels->clear();
@ -803,8 +801,7 @@ void Window::reloadDisplayDriver() {
m_shaderView.reset(); m_shaderView.reset();
m_shaderView = std::make_unique<ShaderSelector>(m_display.get(), m_config); m_shaderView = std::make_unique<ShaderSelector>(m_display.get(), m_config);
#endif #endif
m_screenWidget->setMinimumSize(m_display->minimumSize());
m_screenWidget->setSizePolicy(m_display->sizePolicy());
connect(this, &Window::shutdown, m_display.get(), &Display::stopDrawing); connect(this, &Window::shutdown, m_display.get(), &Display::stopDrawing);
connect(m_display.get(), &Display::hideCursor, [this]() { connect(m_display.get(), &Display::hideCursor, [this]() {
if (static_cast<QStackedLayout*>(m_screenWidget->layout())->currentWidget() == m_display.get()) { if (static_cast<QStackedLayout*>(m_screenWidget->layout())->currentWidget() == m_display.get()) {
@ -830,6 +827,7 @@ void Window::reloadDisplayDriver() {
#endif #endif
if (m_controller) { if (m_controller) {
m_display->setMinimumSize(m_controller->screenDimensions());
connect(m_controller.get(), &CoreController::stopping, m_display.get(), &Display::stopDrawing); connect(m_controller.get(), &CoreController::stopping, m_display.get(), &Display::stopDrawing);
connect(m_controller.get(), &CoreController::stateLoaded, m_display.get(), &Display::forceDraw); connect(m_controller.get(), &CoreController::stateLoaded, m_display.get(), &Display::forceDraw);
connect(m_controller.get(), &CoreController::rewound, m_display.get(), &Display::forceDraw); connect(m_controller.get(), &CoreController::rewound, m_display.get(), &Display::forceDraw);
@ -840,6 +838,12 @@ void Window::reloadDisplayDriver() {
attachWidget(m_display.get()); attachWidget(m_display.get());
m_display->startDrawing(m_controller); m_display->startDrawing(m_controller);
} else {
#ifdef M_CORE_GB
m_display->setMinimumSize(GB_VIDEO_HORIZONTAL_PIXELS, GB_VIDEO_VERTICAL_PIXELS);
#elif defined(M_CORE_GBA)
m_display->setMinimumSize(VIDEO_HORIZONTAL_PIXELS, VIDEO_VERTICAL_PIXELS);
#endif
} }
} }