i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid menus in menufields going out of the screen in the upper part

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16316 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2006-02-09 20:58:15 +00:00
parent f877af82fe
commit 2a5bad1541
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Menu.cpp
+10
View File
@@ -1463,6 +1463,12 @@ BMenu::CalcFrame(BPoint where, bool *scrollOn)
BMenu *superMenu = Supermenu(); BMenu *superMenu = Supermenu();
BMenuItem *superItem = Superitem(); BMenuItem *superItem = Superitem();
if (scrollOn != NULL) {
// basically, if this returns false, it means
// that the menu frame won't fit completely inside the screen
*scrollOn = !screenFrame.Contains(bounds);
}
// TODO: Horrible hack: // TODO: Horrible hack:
// When added to a BMenuField, a BPopUpMenu is the child of // When added to a BMenuField, a BPopUpMenu is the child of
// a _BMCItem_ inside a _BMCMenuBar_ to "fake" the menu hierarchy // a _BMCItem_ inside a _BMCMenuBar_ to "fake" the menu hierarchy
@@ -1472,9 +1478,13 @@ BMenu::CalcFrame(BPoint where, bool *scrollOn)
if (frame.bottom > screenFrame.bottom) if (frame.bottom > screenFrame.bottom)
frame.OffsetBy(0, screenFrame.bottom - frame.bottom); frame.OffsetBy(0, screenFrame.bottom - frame.bottom);
else if (frame.top < screenFrame.top)
frame.OffsetBy(0, -frame.top);
if (frame.right > screenFrame.right) if (frame.right > screenFrame.right)
frame.OffsetBy(screenFrame.right - frame.right, 0); frame.OffsetBy(screenFrame.right - frame.right, 0);
else if (frame.left < screenFrame.left)
frame.OffsetBy(-frame.left, 0);
return frame; return frame;
} }