FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Stephan Huber, fixes to Cocoa support

Browse Source
This commit is contained in:
Robert Osfield
2009-06-25 16:12:58 +00:00
parent 06abd75198
commit 3a65636893
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgViewer/DarwinUtils.mm
View File

@@ -145,7 +145,7 @@ void MenubarController::update()
++i;
}
else
i= _list.erase(i);
i = _list.erase(i);
}
// if we use the cocoa implementation then we have a NSRunLoop in place, and so we can use the deferred menubar-toggling which is thread safe
@@ -182,7 +182,7 @@ void MenubarController::update()
{
error = SetSystemUIMode(kUIModeAllHidden, kUIOptionAutoShowMenuBar);
}
else
if (!windowsCoveringMenubarArea && !_menubarShown)
{
error = SetSystemUIMode(kUIModeNormal, 0);
}

8
src/osgViewer/GraphicsWindowCocoa.mm
View File

@@ -19,9 +19,9 @@
#include "DarwinUtils.h"
#define DEBUG_OUT(s) std::cout << "GraphicsWindowCocoa :: " << s << std::endl;
//#define DEBUG_OUT(s) std::cout << "GraphicsWindowCocoa :: " << s << std::endl;
//#define DEBUG_OUT(s) ;
#define DEBUG_OUT(s) ;
static bool s_quit_requested = false;
@@ -43,8 +43,8 @@ class CocoaKeyboardMap {
CocoaKeyboardMap()
{
_keymap[27] = osgGA::GUIEventAdapter::KEY_Escape;
_keymap[13] = osgGA::GUIEventAdapter::KEY_KP_Enter;
_keymap[3] = osgGA::GUIEventAdapter::KEY_Return;
_keymap[13] = osgGA::GUIEventAdapter::KEY_Return;
_keymap[3] = osgGA::GUIEventAdapter::KEY_KP_Enter;
_keymap[9] = osgGA::GUIEventAdapter::KEY_Tab;
_keymap[32] = osgGA::GUIEventAdapter::KEY_Space;
_keymap[127] = osgGA::GUIEventAdapter::KEY_BackSpace;