mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-02-21 18:39:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3 from RipleyTom/OpenGLFix

Browse Source 
Fix openGL
This commit is contained in:
Megamouse 2017-07-20 22:29:46 +02:00 committed by Ivan
parent f8c2e198c5
commit e93fbc6900
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rpcs3/rpcs3qt/gs_frame.cpp
View File

@ -34,7 +34,8 @@ gs_frame::gs_frame(const QString& title, int w, int h, QIcon appIcon)
resize(w, h); resize(w, h);
setVisibility(QWindow::Visibility::AutomaticVisibility); setVisibility(Hidden);
create();
// Change cursor when in fullscreen. // Change cursor when in fullscreen.
connect(this, &QWindow::visibilityChanged, this, &gs_frame::HandleCursor); connect(this, &QWindow::visibilityChanged, this, &gs_frame::HandleCursor);
@ -97,7 +98,7 @@ void gs_frame::OnFullScreen()
void gs_frame::close() void gs_frame::close()
{ {
Emu.Stop(); Emu.Stop();
Emu.CallAfter([=]() {QWindow::close(); deleteLater(); }); Emu.CallAfter([=]() { deleteLater(); });
} }
bool gs_frame::shown() bool gs_frame::shown()
@ -215,13 +216,12 @@ void gs_frame::HandleCursor(QWindow::Visibility visibility)
} }
} }
/** Override qt hideEvent. bool gs_frame::event(QEvent* ev)
* For some reason beyond me, hitting X hides the game window instead of closes. To remedy this, I forcefully murder it for commiting this transgression.
* Closing the window has a side-effect of also stopping the emulator.
*/
void gs_frame::hideEvent(QHideEvent* ev)
{ {
Q_UNUSED(ev); if (ev->type()==QEvent::Close)
{
close(); close();
return true;
}
return false;
} }

2
rpcs3/rpcs3qt/gs_frame.h
View File

@ -39,7 +39,7 @@ protected:
int client_width() override; int client_width() override;
int client_height() override; int client_height() override;
void hideEvent(QHideEvent* ev) override; bool event(QEvent* ev) override;
private Q_SLOTS: private Q_SLOTS:
void HandleCursor(QWindow::Visibility visibility); void HandleCursor(QWindow::Visibility visibility);
}; };