X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FMain%2FFGEventHandler.cxx;h=d6be62054e365fd9704147a01678a43ba014d6e4;hb=0f9f0924121e680c68a1f6388d13a4c84ad1ded6;hp=56dcb564cf51eb5f023a7a4a2077b2d1fe2ef515;hpb=4f4434787fb40e02a35b401171f2a7370e0d5463;p=flightgear.git diff --git a/src/Main/FGEventHandler.cxx b/src/Main/FGEventHandler.cxx index 56dcb564c..d6be62054 100644 --- a/src/Main/FGEventHandler.cxx +++ b/src/Main/FGEventHandler.cxx @@ -147,10 +147,6 @@ bool FGEventHandler::handle(const osgGA::GUIEventAdapter& ea, switch (ea.getEventType()) { case osgGA::GUIEventAdapter::FRAME: - if (idleHandler) - (*idleHandler)(); - if (drawHandler) - (*drawHandler)(); mouseWarped = false; handleStats(us); return true; @@ -217,6 +213,7 @@ bool FGEventHandler::handle(const osgGA::GUIEventAdapter& ea, (*mouseMotionHandler)(x, y); return true; case osgGA::GUIEventAdapter::RESIZE: + CameraGroup::getDefault()->resized(); if (resizable && windowResizeHandler) (*windowResizeHandler)(ea.getWindowWidth(), ea.getWindowHeight()); return true; @@ -274,9 +271,14 @@ void FGEventHandler::handleKey(const osgGA::GUIEventAdapter& ea, int& key, std::map::iterator numPadIter = numlockKeyMap.find(key); if (numPadIter != numlockKeyMap.end()) { +#ifdef __APPLE__ + // Num Lock is always true on Mac + key = numPadIter->second; +#else if (ea.getModKeyMask() & osgGA::GUIEventAdapter::MODKEY_NUM_LOCK) { key = numPadIter->second; } +#endif } modifiers = osgToFGModifiers(ea.getModKeyMask());