all repos — mgba @ d0e1a5d5d2383a3e1a423fdcccc333b7c7302cca

mGBA Game Boy Advance Emulator

Qt: Fix multiplayer windows opening as the wrong size
Jeffrey Pfau jeffrey@endrift.com
Sun, 19 Apr 2015 04:31:50 -0700
commit

d0e1a5d5d2383a3e1a423fdcccc333b7c7302cca

parent

3b0e0c7178c92587c1c436b8c4d41500bf4adfa4

2 files changed, 6 insertions(+), 0 deletions(-)

jump to
M CHANGESCHANGES

@@ -15,6 +15,7 @@ - Qt: Fix potential crash if a gamepad causes focus to change

- GBA Memory: Allow SRAM to be 64kB - Qt: Fix controller axis querying - GBA Memory: Fix 32-bit loads from unaddress cartridge space + - Qt: Fix multiplayer windows opening as the wrong size Misc: - Qt: Show multiplayer numbers in window title - Qt: Solar sensor can have shortcuts set
M src/platform/qt/Window.cppsrc/platform/qt/Window.cpp

@@ -612,9 +612,14 @@ m_controller->setMultiplayerController(multiplayer);

} Window* w2 = new Window(m_config, multiplayer->attached()); w2->setAttribute(Qt::WA_DeleteOnClose); +#ifndef Q_OS_MAC + w2->show(); +#endif w2->loadConfig(); w2->controller()->setMultiplayerController(multiplayer); +#ifdef Q_OS_MAC w2->show(); +#endif }); addControlledAction(fileMenu, multiWindow, "multiWindow");