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

BMCMenuBar: Refactor MakeFocus()

Browse Source 
Get rid of unused fRunner variable.

It is very basic now, it just works.

Also, renamed msg to message in MessageReceived() and
declared MakeFocus() above it (alphabetically).
This commit is contained in:
John Scipione
2013-08-25 00:09:28 -04:00
parent 8f74b98905
commit 3dd9ff2b5d
2 changed files with 14 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/interface/BMCPrivate.h
+1 -5
View File
@@ -19,9 +19,6 @@
static const float kVMargin = 2.0f;
class BMessageRunner;
class _BMCFilter_ : public BMessageFilter {
public:
_BMCFilter_(BMenuField* menuField, uint32 what);
@@ -49,8 +46,8 @@ public:
virtual void AttachedToWindow();
virtual void Draw(BRect updateRect);
virtual void FrameResized(float width, float height);
virtual void MessageReceived(BMessage* msg);
virtual void MakeFocus(bool focused = true);
virtual void MessageReceived(BMessage* message);
virtual void SetMaxContentWidth(float width);
virtual void SetEnabled(bool enabled);
@@ -69,7 +66,6 @@ private:
BMenuField* fMenuField;
bool fFixedSize;
BMessageRunner* fRunner;
bool fShowPopUpMarker;
float fPreviousWidth;
};
src/kits/interface/BMCPrivate.cpp
+13 -37
View File
@@ -67,7 +67,6 @@ _BMCMenuBar_::_BMCMenuBar_(BRect frame, bool fixedSize, BMenuField* menuField)
!fixedSize),
fMenuField(menuField),
fFixedSize(fixedSize),
fRunner(NULL),
fShowPopUpMarker(true)
{
_Init();
@@ -79,7 +78,6 @@ _BMCMenuBar_::_BMCMenuBar_(BMenuField* menuField)
BMenuBar("_mc_mb_", B_ITEMS_IN_ROW),
fMenuField(menuField),
fFixedSize(true),
fRunner(NULL),
fShowPopUpMarker(true)
{
_Init();
@@ -91,7 +89,6 @@ _BMCMenuBar_::_BMCMenuBar_(BMessage* data)
BMenuBar(data),
fMenuField(NULL),
fFixedSize(true),
fRunner(NULL),
fShowPopUpMarker(true)
{
SetFlags(Flags() | B_FRAME_EVENTS);
@@ -104,7 +101,6 @@ _BMCMenuBar_::_BMCMenuBar_(BMessage* data)
_BMCMenuBar_::~_BMCMenuBar_()
{
delete fRunner;
}
@@ -215,9 +211,19 @@ _BMCMenuBar_::FrameResized(float width, float height)
void
_BMCMenuBar_::MessageReceived(BMessage* msg)
_BMCMenuBar_::MakeFocus(bool focused)
{
switch (msg->what) {
if (IsFocus() == focused)
return;
BMenuBar::MakeFocus(focused);
}
void
_BMCMenuBar_::MessageReceived(BMessage* message)
{
switch (message->what) {
case 'TICK':
{
BMenuItem* item = ItemAt(0);
@@ -235,42 +241,12 @@ _BMCMenuBar_::MessageReceived(BMessage* msg)
}
// fall through
default:
BMenuBar::MessageReceived(msg);
BMenuBar::MessageReceived(message);
break;
}
}
void
_BMCMenuBar_::MakeFocus(bool focused)
{
if (IsFocus() == focused)
return;
BMenuBar::MakeFocus(focused);
if (focused) {
BMessage message('TICK');
//fRunner = new BMessageRunner(BMessenger(this, NULL, NULL), &message,
// 50000, -1);
} else if (fRunner) {
//delete fRunner;
fRunner = NULL;
}
if (focused)
return;
fMenuField->fSelected = false;
fMenuField->fTransition = true;
BRect bounds(fMenuField->Bounds());
fMenuField->Invalidate(BRect(bounds.left, bounds.top, fMenuField->fDivider,
bounds.bottom));
}
void
_BMCMenuBar_::SetMaxContentWidth(float width)
{