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

* _BMCItem_ is no longer used, but I didn't remove it

Browse Source 
yet, just commented it out in BMenuField. As was expected,
  nothing changed in any obvious way
* made the _BMCMenuBar_ draw the popup marked. I changed it
  a bit, inspired from some mockup I saw, sorry I don't
  remember where. I hope you like it (it is easily changed
  back if you don't).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16444 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2006-02-16 22:57:19 +00:00
parent ccf81dc9d2
commit f282009d15
2 changed files with 115 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/MenuField.cpp
+22 -20
View File
@@ -35,7 +35,8 @@ BMenuField::BMenuField(BRect frame, const char *name, const char *label,
false, this);
AddChild(fMenuBar);
fMenuBar->AddItem(new _BMCItem_(menu));
// fMenuBar->AddItem(new _BMCItem_(menu));
fMenuBar->AddItem(menu);
fMenuBar->SetFont(be_plain_font);
@@ -60,7 +61,8 @@ BMenuField::BMenuField(BRect frame, const char *name, const char *label,
fixedSize, this);
AddChild(fMenuBar);
fMenuBar->AddItem(new _BMCItem_(menu));
// fMenuBar->AddItem(new _BMCItem_(menu));
fMenuBar->AddItem(menu);
fMenuBar->SetFont(be_plain_font);
@@ -95,17 +97,17 @@ BMenuField::BMenuField(BMessage *data)
if (data->FindBool("be:fixeds", &fixed) == B_OK)
fFixedSizeMB = fixed;
BMenuItem *item = fMenuBar->ItemAt(0);
if (!item)
return;
_BMCItem_ *bmcitem = dynamic_cast<_BMCItem_*>(item);
if (!bmcitem)
return;
bool dmark;
if (data->FindBool("be:dmark", &dmark))
bmcitem->fShowPopUpMarker = dmark;
// BMenuItem *item = fMenuBar->ItemAt(0);
// if (!item)
// return;
//
// _BMCItem_ *bmcitem = dynamic_cast<_BMCItem_*>(item);
// if (!bmcitem)
// return;
//
// bool dmark;
// if (data->FindBool("be:dmark", &dmark))
// bmcitem->fShowPopUpMarker = dmark;
}
@@ -145,13 +147,13 @@ BMenuField::Archive(BMessage *data, bool deep) const
if (fFixedSizeMB)
data->AddBool("be:fixeds", true);
BMenuItem *item = fMenuBar->ItemAt(0);
if (!item)
return B_OK;
_BMCItem_ *bmcitem = dynamic_cast<_BMCItem_*>(item);
if (bmcitem && !bmcitem->fShowPopUpMarker)
data->AddBool("be:dmark", false);
// BMenuItem *item = fMenuBar->ItemAt(0);
// if (!item)
// return B_OK;
//
// _BMCItem_ *bmcitem = dynamic_cast<_BMCItem_*>(item);
// if (bmcitem && !bmcitem->fShowPopUpMarker)
// data->AddBool("be:dmark", false);
return B_OK;
}