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

From Stephan Huber, added support for double click event for OSX.

Browse Source
This commit is contained in:
Robert Osfield
2008-01-28 16:38:39 +00:00
parent 6224c99692
commit b45e32afc9
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/osgViewer/GraphicsWindowCarbon.cpp
View File

@@ -604,7 +604,7 @@ bool GraphicsWindowCarbon::realizeImplementation()
setWindowDecoration(_traits->windowDecoration);
useCursor(_traits->useCursor);
// move the window to the right screen
OSXCarbonWindowingSystemInterface* wsi = dynamic_cast<OSXCarbonWindowingSystemInterface*>(osg::GraphicsContext::getWindowingSystemInterface());
int screenLeft(0), screenTop(0);
@@ -804,7 +804,8 @@ bool GraphicsWindowCarbon::handleMouseEvent(EventRef theEvent)
}
else
{
UInt32 clickCount;
GetEventParameter(theEvent, kEventParamClickCount, typeUInt32, NULL, sizeof(clickCount), NULL, &clickCount);
// swap right and middle buttons so that middle button is 2, right button is 3.
if (mouseButton==3) mouseButton = 2;
else if (mouseButton==2) mouseButton = 3;
@@ -862,7 +863,10 @@ bool GraphicsWindowCarbon::handleMouseEvent(EventRef theEvent)
}
}
getEventQueue()->mouseButtonPress(mx, my, mouseButton);
if (clickCount > 1)
getEventQueue()->mouseDoubleButtonPress(mx,my, mouseButton);
else
getEventQueue()->mouseButtonPress(mx, my, mouseButton);
}
break;
case kEventMouseUp:
@@ -1166,6 +1170,7 @@ void GraphicsWindowCarbon::setWindowName (const std::string& name)
}
void GraphicsWindowCarbon::transformMouseXY(float& x, float& y)
{
if (getEventQueue()->getUseFixedMouseInputRange())