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

Qt: Fix multiplayer windows opening as the wrong size

This commit is contained in:
Jeffrey Pfau 2015-04-19 04:31:50 -07:00
parent b84c421865
commit 049e3639d1
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -30,6 +30,7 @@ Bugfixes:
- Qt: Fix controller axis querying - Qt: Fix controller axis querying
- GBA Memory: Improve Thumb open bus behavior - GBA Memory: Improve Thumb open bus behavior
- GBA Memory: Fix 32-bit loads from unaddress cartridge space - GBA Memory: Fix 32-bit loads from unaddress cartridge space
- Qt: Fix multiplayer windows opening as the wrong size
Misc: Misc:
- Qt: Show multiplayer numbers in window title - Qt: Show multiplayer numbers in window title

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

@ -658,9 +658,14 @@ void Window::setupMenu(QMenuBar* menubar) {
} }
Window* w2 = new Window(m_config, multiplayer->attached()); Window* w2 = new Window(m_config, multiplayer->attached());
w2->setAttribute(Qt::WA_DeleteOnClose); w2->setAttribute(Qt::WA_DeleteOnClose);
#ifndef Q_OS_MAC
w2->show();
#endif
w2->loadConfig(); w2->loadConfig();
w2->controller()->setMultiplayerController(multiplayer); w2->controller()->setMultiplayerController(multiplayer);
#ifdef Q_OS_MAC
w2->show(); w2->show();
#endif
}); });
addControlledAction(fileMenu, multiWindow, "multiWindow"); addControlledAction(fileMenu, multiWindow, "multiWindow");