Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git@github.com:Shyotl/SingularityViewer.git

Browse Source
This commit is contained in:
Shyotl
2017-02-08 01:00:32 -06:00
parent 7a1633abdf 271c37442d
commit aee659b518
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/llui/llmenugl.cpp
View File

@@ -1509,11 +1509,18 @@ void LLMenuItemBranchGL::openMenu()
branch->localPointToOtherView( 0, 0, &x, &y, branch->getParent() );
F32 center_y = top - (getRect().getHeight() / 2.f);
if( y < menu_region_rect.mBottom && center_y <= menu_region_rect.getCenterY())
{
// open upwards if menu extends past bottom
// adjust by the height of the menu item branch since it is a submenu
delta_y = branch_rect.getHeight() - getRect().getHeight();
delta_y = branch_rect.getHeight() - getRect().getHeight();
// Singu: Handle menu clipping off the top of the screen too.
if ( branch_rect.mTop + delta_y > menu_region_rect.mTop )
{
delta_y -= branch_rect.mTop + delta_y - menu_region_rect.mTop;
delta_y -= delta_y % getRect().getHeight();
}
}
if( x + branch_rect.getWidth() > menu_region_rect.mRight )