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

Redo background texturing

This commit is contained in:
Jeffrey Pfau 2014-10-17 00:53:34 -07:00
parent b74a5a5293
commit a6f5bbbeb9
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/platform/qt/LoadSaveState.cpp
View File

@ -20,9 +20,6 @@ LoadSaveState::LoadSaveState(GameController* controller, QWidget* parent)
{
m_ui.setupUi(this);
QImage currentImage(reinterpret_cast<const uchar*>(controller->drawContext()), VIDEO_HORIZONTAL_PIXELS, VIDEO_VERTICAL_PIXELS, 1024, QImage::Format_RGB32);
m_currentImage.convertFromImage(currentImage.rgbSwapped());
m_slots[0] = m_ui.state1;
m_slots[1] = m_ui.state2;
m_slots[2] = m_ui.state3;

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

@ -18,7 +18,7 @@ Window::Window(QWidget* parent)
: QMainWindow(parent)
, m_logView(new LogView())
, m_stateWindow(nullptr)
, m_screenWidget(new QWidget())
, m_screenWidget(new QLabel())
#ifdef USE_GDB_STUB
, m_gdbController(nullptr)
#endif
@ -29,8 +29,11 @@ Window::Window(QWidget* parent)
format.setSwapInterval(1);
m_screenWidget->setLayout(new QStackedLayout());
m_screenWidget->layout()->setContentsMargins(0, 0, 0, 0);
m_screenWidget->setScaledContents(true);
setCentralWidget(m_screenWidget);
m_display = new Display(format);
m_screenWidget->setMinimumSize(m_display->minimumSize());
m_screenWidget->setSizePolicy(m_display->sizePolicy());
attachWidget(m_display);
connect(m_controller, SIGNAL(gameStarted(GBAThread*)), this, SLOT(gameStarted(GBAThread*)));
connect(m_controller, SIGNAL(gameStopped(GBAThread*)), m_display, SLOT(stopDrawing()));
@ -179,11 +182,7 @@ void Window::openStateWindow(LoadSave ls) {
}
m_stateWindow->setAttribute(Qt::WA_DeleteOnClose);
m_stateWindow->setMode(ls);
if (isFullScreen()) {
attachWidget(m_stateWindow);
} else {
m_stateWindow->show();
}
attachWidget(m_stateWindow);
}
void Window::setupMenu(QMenuBar* menubar) {
@ -240,7 +239,14 @@ void Window::setupMenu(QMenuBar* menubar) {
pause->setCheckable(true);
pause->setShortcut(tr("Ctrl+P"));
connect(pause, SIGNAL(triggered(bool)), m_controller, SLOT(setPaused(bool)));
connect(m_controller, &GameController::gamePaused, [pause]() { pause->setChecked(true); });
connect(m_controller, &GameController::gamePaused, [this, pause]() {
pause->setChecked(true);
QImage currentImage(reinterpret_cast<const uchar*>(m_controller->drawContext()), VIDEO_HORIZONTAL_PIXELS, VIDEO_VERTICAL_PIXELS, 1024, QImage::Format_RGB32);
QPixmap pixmap;
pixmap.convertFromImage(currentImage.rgbSwapped());
m_screenWidget->setPixmap(pixmap);
});
connect(m_controller, &GameController::gameUnpaused, [pause]() { pause->setChecked(false); });
m_gameActions.append(pause);
emulationMenu->addAction(pause);

2
src/platform/qt/Window.h
View File

@ -64,7 +64,7 @@ private:
QList<QAction*> m_gameActions;
LogView* m_logView;
LoadSaveState* m_stateWindow;
QWidget* m_screenWidget;
QLabel* m_screenWidget;
#ifdef USE_GDB_STUB
GDBController* m_gdbController;