Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added some code to draw "empty" in empty menus. Not working for the

Browse Source 
moment, but committing since it's too late to continue working, and at 
least the window is resized correctly...


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16142 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini 2006-01-29 22:27:46 +00:00
parent 8a1f6775b9
commit 61ba5a32c1
3 changed files with 44 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
headers/private/interface/MenuWindow.h
View File

@ -34,9 +34,10 @@ class BMenuScroller;
class BMenuWindow : public BWindow {
public:
BMenuWindow(const char *name);
BMenuWindow(const char *name, BMenu *menu);
virtual ~BMenuWindow();
void SetMenu(BMenu *menu);
void UpdateScrollers();
private:

17
src/kits/interface/Menu.cpp
View File

@ -1044,15 +1044,17 @@ BMenu::_show(bool selectFirstItem)
// See if the supermenu has a cached menuwindow,
// and use that one if possible.
BMenuWindow *window = NULL;
if (fSuper != NULL)
if (fSuper != NULL) {
window = fSuper->MenuWindow();
if (window != NULL)
window->SetMenu(this);
}
// Otherwise, create a new one
// Actually, I think this can only happen for
// "stand alone" BPopUpMenus (i.e. not within a BMenuField)
if (window == NULL) {
// Menu windows get the BMenu's handler name
window = new BMenuWindow(Name());
window = new BMenuWindow(Name(), this);
}
if (window == NULL)
@ -1572,7 +1574,7 @@ BMenu::MenuWindow()
if (fCachedMenuWindow == NULL) {
char windowName[64];
snprintf(windowName, 64, "%s cached menuwindow\n", Name());
fCachedMenuWindow = new BMenuWindow(windowName);
fCachedMenuWindow = new BMenuWindow(windowName, this);
}
return fCachedMenuWindow;
@ -1807,7 +1809,12 @@ BMenu::UpdateWindowViewSize(bool upWind)
BRect frame = CalcFrame(ScreenLocation(), &scroll);
ResizeTo(frame.Width(), frame.Height());
window->ResizeTo(Bounds().Width() + 2, Bounds().Height() + 2);
if (fItems.CountItems() > 0)
window->ResizeTo(Bounds().Width() + 2, Bounds().Height() + 2);
else {
CacheFontInfo();
window->ResizeTo(StringWidth("<empty>") + 4, fFontHeight + 6);
}
window->MoveTo(frame.LeftTop());
}

38
src/kits/interface/MenuWindow.cpp
View File

@ -36,14 +36,17 @@ const window_feel kMenuWindowFeel = (window_feel)1025;
// This draws the frame around the BMenu
class BMenuFrame : public BView {
public:
BMenuFrame() ;
BMenuFrame(BMenu *menu) ;
virtual void AttachedToWindow();
virtual void Draw(BRect updateRect);
private:
BMenu *fMenu;
};
BMenuWindow::BMenuWindow(const char *name)
BMenuWindow::BMenuWindow(const char *name, BMenu *menu)
:
// The window will be resized by BMenu, so just pass a dummy rect
//BWindow(BRect(0, 0, 0, 0), name, B_BORDERED_WINDOW_LOOK, kMenuWindowFeel,
@ -53,8 +56,7 @@ BMenuWindow::BMenuWindow(const char *name)
fUpperScroller(NULL),
fLowerScroller(NULL)
{
BMenuFrame *menuFrame = new BMenuFrame();
AddChild(menuFrame);
SetMenu(menu);
}
@ -63,10 +65,21 @@ BMenuWindow::~BMenuWindow()
}
void
BMenuWindow::SetMenu(BMenu *menu)
{
if (CountChildren() > 0)
RemoveChild(ChildAt(0));
BMenuFrame *menuFrame = new BMenuFrame(menu);
AddChild(menuFrame);
}
// BMenuFrame
BMenuFrame::BMenuFrame()
BMenuFrame::BMenuFrame(BMenu *menu)
:
BView(BRect(0, 0, 1, 1), "menu frame", B_FOLLOW_ALL_SIDES, B_WILL_DRAW)
BView(BRect(0, 0, 1, 1), "menu frame", B_FOLLOW_ALL_SIDES, B_WILL_DRAW),
fMenu(menu)
{
}
@ -82,9 +95,18 @@ BMenuFrame::AttachedToWindow()
void
BMenuFrame::Draw(BRect updateRect)
{
if (fMenu->CountItems() == 0) {
SetHighColor(ui_color(B_MENU_BACKGROUND_COLOR));
FillRect(updateRect);
font_height height;
fMenu->GetFontHeight(&height);
fMenu->SetHighColor(tint_color(ui_color(B_MENU_BACKGROUND_COLOR), B_DISABLED_LABEL_TINT));
// TODO: This doesn't get drawn for some reason
fMenu->DrawString("<empty>", BPoint(2, ceilf(height.ascent + 2)));
}
SetHighColor(tint_color(ui_color(B_MENU_BACKGROUND_COLOR), B_DARKEN_2_TINT));
BRect bounds(Bounds());
SetHighColor(tint_color(ui_color(B_MENU_BACKGROUND_COLOR), B_DARKEN_2_TINT));
StrokeLine(BPoint(bounds.right, bounds.top),
BPoint(bounds.right, bounds.bottom - 1));
StrokeLine(BPoint(bounds.left + 1, bounds.bottom),