citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Merge pull request #1106 from Kloen/fix-connect 

citra-qt: Fix connect error on startup (#449)
This commit is contained in:
bunnei 2015-09-21 21:16:48 -04:00
parent b58a48d796 541fc80240
commit ca5ea5142d
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/citra_qt/bootmanager.cpp
View File

@ -128,9 +128,6 @@ GRenderWindow::GRenderWindow(QWidget* parent, EmuThread* emu_thread) :
BackupGeometry();
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
connect(this->windowHandle(), SIGNAL(screenChanged(QScreen*)), this, SLOT(OnFramebufferSizeChanged()));
#endif
}
void GRenderWindow::moveContext()
@ -278,3 +275,12 @@ void GRenderWindow::OnEmulationStarting(EmuThread* emu_thread) {
void GRenderWindow::OnEmulationStopping() {
emu_thread = nullptr;
}
void GRenderWindow::showEvent(QShowEvent * event) {
QWidget::showEvent(event);
// windowHandle() is not initialized until the Window is shown, so we connect it here.
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
connect(this->windowHandle(), SIGNAL(screenChanged(QScreen*)), this, SLOT(OnFramebufferSizeChanged()), Qt::UniqueConnection);
#endif
}

6
src/citra_qt/bootmanager.h
View File

@ -123,13 +123,12 @@ public:
void OnClientAreaResized(unsigned width, unsigned height);
void OnFramebufferSizeChanged();
public slots:
void moveContext(); // overridden
void OnEmulationStarting(EmuThread* emu_thread);
void OnEmulationStopping();
void OnFramebufferSizeChanged();
signals:
/// Emitted when the window is closed
@ -146,4 +145,7 @@ private:
int keyboard_id;
EmuThread* emu_thread;
protected:
void showEvent(QShowEvent* event) override;
};