mirror of
https://github.com/citra-emu/citra.git
synced 2024-11-24 04:51:05 +00:00
Added showEvent() method to GRenderWindow to keep GMainWindow clean
This commit is contained in:
parent
512c749f79
commit
0093206dd8
@ -331,3 +331,11 @@ void GRenderWindow::OnClientAreaResized(unsigned width, unsigned height)
|
|||||||
void GRenderWindow::OnMinimalClientAreaChangeRequest(const std::pair<unsigned,unsigned>& minimal_size) {
|
void GRenderWindow::OnMinimalClientAreaChangeRequest(const std::pair<unsigned,unsigned>& minimal_size) {
|
||||||
setMinimumSize(minimal_size.first, minimal_size.second);
|
setMinimumSize(minimal_size.first, minimal_size.second);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GRenderWindow::showEvent(QShowEvent * event) {
|
||||||
|
QWidget::showEvent(event);
|
||||||
|
|
||||||
|
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
|
||||||
|
connect(this->windowHandle(), SIGNAL(screenChanged(QScreen*)), this, SLOT(OnFramebufferSizeChanged()));
|
||||||
|
#endif
|
||||||
|
}
|
@ -145,4 +145,7 @@ private:
|
|||||||
|
|
||||||
/// Device id of keyboard for use with KeyMap
|
/// Device id of keyboard for use with KeyMap
|
||||||
int keyboard_id;
|
int keyboard_id;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
void showEvent(QShowEvent * event) override;
|
||||||
};
|
};
|
||||||
|
@ -160,10 +160,6 @@ GMainWindow::GMainWindow()
|
|||||||
|
|
||||||
show();
|
show();
|
||||||
|
|
||||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
|
|
||||||
connect(render_window->windowHandle(), SIGNAL(screenChanged(QScreen*)), render_window, SLOT(OnFramebufferSizeChanged()));
|
|
||||||
#endif
|
|
||||||
|
|
||||||
QStringList args = QApplication::arguments();
|
QStringList args = QApplication::arguments();
|
||||||
if (args.length() >= 2) {
|
if (args.length() >= 2) {
|
||||||
BootGame(args[1].toStdString());
|
BootGame(args[1].toStdString());
|
||||||
|
Loading…
Reference in New Issue
Block a user