mirror of
https://review.haiku-os.org/haiku
synced 2025-01-24 07:14:48 +01:00
c1a7e89fc2
Just a few commits ago I moved the label truncation code out of BMenuItem and into BMCMenuBar because the truncation had to happen outside of BMenuItem. Turns out, that wasn't true so I'm moving the label truncation back into BMenuItem and removing the _DrawItems() method from BMCMenuBar. Note that the code is not a copy of what was there before, but, the updated version I created for BMCMenuBar. The main difference is that I use menuPrivate.Padding() instead of GetItemMargins() and I always use the width of the parent menu frame instead of using fBounds even if the state is not MENU_STATE_CLOSED. These are changes needed for BMCMenuBar but should work just as well for a regular BMenu.
73 lines
1.7 KiB
C++
73 lines
1.7 KiB
C++
/*
|
|
* Copyright 2001-2013 Haiku, Inc. All rights reserved.
|
|
* Distributed under the terms of the MIT License.
|
|
*
|
|
* Authors:
|
|
* Stephan Aßmus, superstippi@gmx.de
|
|
* Marc Flerackers, mflerackers@androme.be
|
|
* John Scipione, jscipione@gmail.com
|
|
*/
|
|
#ifndef _BMC_PRIVATE_H
|
|
#define _BMC_PRIVATE_H
|
|
|
|
|
|
#include <BeBuild.h>
|
|
#include <MenuBar.h>
|
|
#include <MenuItem.h>
|
|
#include <MessageFilter.h>
|
|
|
|
class BMessageRunner;
|
|
|
|
|
|
class _BMCFilter_ : public BMessageFilter {
|
|
public:
|
|
_BMCFilter_(BMenuField* menuField, uint32 what);
|
|
virtual ~_BMCFilter_();
|
|
|
|
virtual filter_result Filter(BMessage* message, BHandler** handler);
|
|
|
|
private:
|
|
_BMCFilter_& operator=(const _BMCFilter_&);
|
|
|
|
BMenuField* fMenuField;
|
|
};
|
|
|
|
|
|
class _BMCMenuBar_ : public BMenuBar {
|
|
public:
|
|
_BMCMenuBar_(BRect frame, bool fixedSize,
|
|
BMenuField* menuField);
|
|
_BMCMenuBar_(BMenuField* menuField);
|
|
_BMCMenuBar_(BMessage* data);
|
|
virtual ~_BMCMenuBar_();
|
|
|
|
static BArchivable* Instantiate(BMessage* data);
|
|
|
|
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);
|
|
|
|
void TogglePopUpMarker(bool show)
|
|
{ fShowPopUpMarker = show; }
|
|
bool IsPopUpMarkerShown() const
|
|
{ return fShowPopUpMarker; }
|
|
|
|
virtual BSize MinSize();
|
|
virtual BSize MaxSize();
|
|
|
|
private:
|
|
_BMCMenuBar_&operator=(const _BMCMenuBar_&);
|
|
|
|
void _Init(bool setMaxContentWidth);
|
|
|
|
BMenuField* fMenuField;
|
|
bool fFixedSize;
|
|
BMessageRunner* fRunner;
|
|
bool fShowPopUpMarker;
|
|
float fPreviousWidth;
|
|
};
|
|
|
|
#endif // _BMC_PRIVATE_H
|