Changeset 10490

Show
Ignore:
Timestamp:
07/16/09 14:06:42 (4 years ago)
Author:
robert
Message:

From Stephane Lamoliatte, "The vertical anchor is inverted in the osgWidget::Window::update function.
Here is a small patch to fix that."

Location:
OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgWidget
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgWidget

    • Property svn:mergeinfo changed from /OpenSceneGraph/trunk/src/osgWidget:10182 to /OpenSceneGraph/trunk/src/osgWidget:10182,10489

  • OpenSceneGraph/branches/OpenSceneGraph-2.8/src/osgWidget/Window.cpp

    r9578 r10490  
    317317    // We only honor ANCHOR requests on topmost Windows, not embedded ones. 
    318318    if((_vAnchor != VA_NONE || _hAnchor != HA_NONE) && !_parent && _wm) { 
    319         if(_vAnchor == VA_TOP) y = 0.0f; 
     319        if(_vAnchor == VA_TOP) y = _wm->getHeight() - _height.current; 
    320320        else if(_vAnchor == VA_CENTER) y = osg::round(_wm->getHeight() / 2.0f); 
    321         else if(_vAnchor == VA_BOTTOM) y = _wm->getHeight() - _height.current; 
     321        else if(_vAnchor == VA_BOTTOM) y = 0.0f; 
    322322 
    323323        if(_hAnchor == HA_LEFT) x = 0.0f;