fly/flightgear
1
0
Fork 0
Code Activity

Merge branch 'next' of gitorious.org:fg/flightgear into next

Browse source
This commit is contained in:
Curtis L. Olson 2011-10-29 10:31:56 -05:00
commit 33f7286180
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Main/FGEventHandler.cxx
View file

@ -242,6 +242,7 @@ bool FGEventHandler::handle(const osgGA::GUIEventAdapter& ea,
CameraGroup::getDefault()->resized();
if (resizable)
globals->get_renderer()->resize(ea.getWindowWidth(), ea.getWindowHeight());
statsHandler->handle(ea, us);
#ifdef SG_MAC
// work around OSG Cocoa-Viewer issue with resize event handling,
// where resize events are queued up, then dispatched in a batch, with

8
src/Main/options.cxx
View file

@ -1467,10 +1467,10 @@ struct OptionDesc {
{"AV400WSimA", true, OPTION_CHANNEL, "", false, "", 0 },
{"AV400WSimB", true, OPTION_CHANNEL, "", false, "", 0 },
{"garmin", true, OPTION_CHANNEL, "", false, "", 0 },
{"nmea", true, OPTION_CHANNEL, "", false, "", 0 },
{"generic", true, OPTION_CHANNEL, "", false, "", 0 },
{"props", true, OPTION_CHANNEL, "", false, "", 0 },
{"telnet", true, OPTION_CHANNEL, "", false, "", 0 },
{"nmea", true, OPTION_CHANNEL | OPTION_MULTI, "", false, "", 0 },
{"generic", true, OPTION_CHANNEL | OPTION_MULTI, "", false, "", 0 },
{"props", true, OPTION_CHANNEL | OPTION_MULTI, "", false, "", 0 },
{"telnet", true, OPTION_CHANNEL | OPTION_MULTI, "", false, "", 0 },
{"pve", true, OPTION_CHANNEL, "", false, "", 0 },
{"ray", true, OPTION_CHANNEL, "", false, "", 0 },
{"rul", true, OPTION_CHANNEL, "", false, "", 0 },