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

Fixed popup menus opened at the wrong position (mostly noticed in Installer) with a horrible hack which I can't see how to avoid

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15941 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2006-01-13 20:48:48 +00:00
parent 89fb2ae90c
commit fc3a8a1c73
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Menu.cpp
+12 -7
View File
@@ -19,6 +19,7 @@
#include <Screen.h> #include <Screen.h>
#include <Window.h> #include <Window.h>
#include <BMCPrivate.h>
#include <MenuPrivate.h> #include <MenuPrivate.h>
#include <MenuWindow.h> #include <MenuWindow.h>
@@ -288,7 +289,7 @@ bool
BMenu::AddItem(BMenuItem *item, int32 index) BMenu::AddItem(BMenuItem *item, int32 index)
{ {
if (fLayout == B_ITEMS_IN_MATRIX) if (fLayout == B_ITEMS_IN_MATRIX)
debugger("BMenu::AddItem(BMenuItem *, int32) this method can only" debugger("BMenu::AddItem(BMenuItem *, int32) this method can only "
"be called if the menu layout is not B_ITEMS_IN_MATRIX"); "be called if the menu layout is not B_ITEMS_IN_MATRIX");
return _AddItem(item, index); return _AddItem(item, index);
@@ -299,8 +300,8 @@ bool
BMenu::AddItem(BMenuItem *item, BRect frame) BMenu::AddItem(BMenuItem *item, BRect frame)
{ {
if (fLayout != B_ITEMS_IN_MATRIX) if (fLayout != B_ITEMS_IN_MATRIX)
debugger("BMenu::AddItem(BMenuItem *, BRect) this method can only" debugger("BMenu::AddItem(BMenuItem *, BRect) this method can only "
" be called if the menu layout is B_ITEMS_IN_MATRIX"); "be called if the menu layout is B_ITEMS_IN_MATRIX");
if (!item) if (!item)
return false; return false;
@@ -326,7 +327,7 @@ bool
BMenu::AddItem(BMenu *submenu, int32 index) BMenu::AddItem(BMenu *submenu, int32 index)
{ {
if (fLayout == B_ITEMS_IN_MATRIX) if (fLayout == B_ITEMS_IN_MATRIX)
debugger("BMenu::AddItem(BMenuItem *, int32) this method can only" debugger("BMenu::AddItem(BMenuItem *, int32) this method can only "
"be called if the menu layout is not B_ITEMS_IN_MATRIX"); "be called if the menu layout is not B_ITEMS_IN_MATRIX");
BMenuItem *item = new BMenuItem(submenu); BMenuItem *item = new BMenuItem(submenu);
@@ -341,8 +342,8 @@ bool
BMenu::AddItem(BMenu *submenu, BRect frame) BMenu::AddItem(BMenu *submenu, BRect frame)
{ {
if (fLayout != B_ITEMS_IN_MATRIX) if (fLayout != B_ITEMS_IN_MATRIX)
debugger("BMenu::AddItem(BMenu *, BRect) this method can only" debugger("BMenu::AddItem(BMenu *, BRect) this method can only "
" be called if the menu layout is B_ITEMS_IN_MATRIX"); "be called if the menu layout is B_ITEMS_IN_MATRIX");
BMenuItem *item = new BMenuItem(submenu); BMenuItem *item = new BMenuItem(submenu);
item->fBounds = frame; item->fBounds = frame;
@@ -1429,7 +1430,11 @@ BMenu::CalcFrame(BPoint where, bool *scrollOn)
BMenu *superMenu = Supermenu(); BMenu *superMenu = Supermenu();
BMenuItem *superItem = Superitem(); BMenuItem *superItem = Superitem();
if (superMenu == NULL || superItem == NULL) { // TODO: Horrible hack:
// When added to a BMenuField, a BPopUpMenu is the child of
// a _BMCItem_ inside a _BMCMenuBar_ to "fake" the menu hierarchy
if (superMenu == NULL || superItem == NULL
|| dynamic_cast<_BMCItem_ *>(superItem) != NULL) {
// just move the window on screen // just move the window on screen
if (frame.bottom > screenFrame.bottom) if (frame.bottom > screenFrame.bottom)