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

Tracker: style fixes to IconMenuItem

Browse Source
This commit is contained in:
John Scipione
2014-06-20 21:01:54 -04:00
parent f2ed47616f
commit ba50b2c229
1 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/tracker/IconMenuItem.cpp
+18 -13
View File
@@ -60,13 +60,14 @@ DimmedIconBlitter(BView* view, BPoint where, BBitmap* bitmap, void*)
} }
// #pragma mark - // #pragma mark - ModelMenuItem
ModelMenuItem::ModelMenuItem(const Model* model, const char* title, ModelMenuItem::ModelMenuItem(const Model* model, const char* title,
BMessage* message, char shortcut, uint32 modifiers, BMessage* message, char shortcut, uint32 modifiers,
bool drawText, bool extraPad) bool drawText, bool extraPad)
: BMenuItem(title, message, shortcut, modifiers), :
BMenuItem(title, message, shortcut, modifiers),
fModel(*model), fModel(*model),
fHeightDelta(0), fHeightDelta(0),
fDrawText(drawText), fDrawText(drawText),
@@ -90,7 +91,8 @@ ModelMenuItem::ModelMenuItem(const Model* model, const char* title,
ModelMenuItem::ModelMenuItem(const Model* model, BMenu* menu, bool drawText, ModelMenuItem::ModelMenuItem(const Model* model, BMenu* menu, bool drawText,
bool extraPad) bool extraPad)
: BMenuItem(menu), :
BMenuItem(menu),
fModel(*model), fModel(*model),
fHeightDelta(0), fHeightDelta(0),
fDrawText(drawText), fDrawText(drawText),
@@ -184,16 +186,16 @@ ModelMenuItem::GetContentSize(float* width, float* height)
status_t status_t
ModelMenuItem::Invoke(BMessage* message) ModelMenuItem::Invoke(BMessage* message)
{ {
if (!Menu()) if (Menu() == NULL)
return B_ERROR; return B_ERROR;
if (!IsEnabled()) if (!IsEnabled())
return B_ERROR; return B_ERROR;
if (!message) if (message == NULL)
message = Message(); message = Message();
if (!message) if (message == NULL)
return B_BAD_VALUE; return B_BAD_VALUE;
BMessage clone(*message); BMessage clone(*message);
@@ -211,7 +213,7 @@ ModelMenuItem::Invoke(BMessage* message)
} }
// #pragma mark - // #pragma mark - SpecialModelMenuItem
/*! /*!
@@ -240,7 +242,7 @@ SpecialModelMenuItem::DrawContent()
} }
// #pragma mark - // #pragma mark - IconMenuItem
/*! /*!
@@ -248,7 +250,8 @@ SpecialModelMenuItem::DrawContent()
It's currently used in the mount and new file template menus. It's currently used in the mount and new file template menus.
*/ */
IconMenuItem::IconMenuItem(const char* label, BMessage* message, BBitmap* icon) IconMenuItem::IconMenuItem(const char* label, BMessage* message, BBitmap* icon)
: PositionPassingMenuItem(label, message), :
PositionPassingMenuItem(label, message),
fDeviceIcon(icon), fDeviceIcon(icon),
fHeightDelta(0) fHeightDelta(0)
{ {
@@ -260,7 +263,8 @@ IconMenuItem::IconMenuItem(const char* label, BMessage* message, BBitmap* icon)
IconMenuItem::IconMenuItem(const char* label, BMessage* message, IconMenuItem::IconMenuItem(const char* label, BMessage* message,
const BNodeInfo* nodeInfo, icon_size which) const BNodeInfo* nodeInfo, icon_size which)
: PositionPassingMenuItem(label, message), :
PositionPassingMenuItem(label, message),
fDeviceIcon(NULL), fDeviceIcon(NULL),
fHeightDelta(0) fHeightDelta(0)
{ {
@@ -285,7 +289,8 @@ IconMenuItem::IconMenuItem(const char* label, BMessage* message,
IconMenuItem::IconMenuItem(const char* label, BMessage* message, IconMenuItem::IconMenuItem(const char* label, BMessage* message,
const char* iconType, icon_size which) const char* iconType, icon_size which)
: PositionPassingMenuItem(label, message), :
PositionPassingMenuItem(label, message),
fDeviceIcon(NULL), fDeviceIcon(NULL),
fHeightDelta(0) fHeightDelta(0)
{ {
@@ -313,7 +318,8 @@ IconMenuItem::IconMenuItem(const char* label, BMessage* message,
IconMenuItem::IconMenuItem(BMenu* submenu, BMessage* message, IconMenuItem::IconMenuItem(BMenu* submenu, BMessage* message,
const char* iconType, icon_size which) const char* iconType, icon_size which)
: PositionPassingMenuItem(submenu, message), :
PositionPassingMenuItem(submenu, message),
fDeviceIcon(NULL), fDeviceIcon(NULL),
fHeightDelta(0) fHeightDelta(0)
{ {
@@ -393,4 +399,3 @@ IconMenuItem::DrawContent()
Menu()->PopState(); Menu()->PopState();
} }