From 09d0a76b7b83810e0a05b2a4574e8583ae7ee6bc Mon Sep 17 00:00:00 2001 From: John Scipione Date: Fri, 20 Feb 2015 14:24:46 -0500 Subject: [PATCH] MenuPrivate: Style fixes to MenuPrivate.h --- headers/private/interface/MenuPrivate.h | 82 +++++++++++++------------ 1 file changed, 43 insertions(+), 39 deletions(-) diff --git a/headers/private/interface/MenuPrivate.h b/headers/private/interface/MenuPrivate.h index daf866fd51..c64db0f11d 100644 --- a/headers/private/interface/MenuPrivate.h +++ b/headers/private/interface/MenuPrivate.h @@ -9,8 +9,10 @@ #ifndef __MENU_PRIVATE_H #define __MENU_PRIVATE_H + #include + enum menu_states { MENU_STATE_TRACKING = 0, MENU_STATE_TRACKING_SUBMENU = 1, @@ -24,65 +26,67 @@ class BBitmap; class BMenu; class BWindow; + namespace BPrivate { -extern const char *kEmptyMenuLabel; - +extern const char* kEmptyMenuLabel; + class MenuPrivate { public: - MenuPrivate(BMenu *menu); - - menu_layout Layout() const; + MenuPrivate(BMenu* menu); - void ItemMarked(BMenuItem *item); - void CacheFontInfo(); - - float FontHeight() const; - float Ascent() const; - BRect Padding() const; - void GetItemMargins(float *, float *, float *, float *) const; + menu_layout Layout() const; - int State(BMenuItem **item = NULL) const; - - void Install(BWindow *window); - void Uninstall(); - void SetSuper(BMenu *menu); - void SetSuperItem(BMenuItem *item); - void InvokeItem(BMenuItem *item, bool now = false); - void QuitTracking(bool thisMenuOnly = true); - - static status_t CreateBitmaps(); - static void DeleteBitmaps(); + void ItemMarked(BMenuItem* item); + void CacheFontInfo(); + + float FontHeight() const; + float Ascent() const; + BRect Padding() const; + void GetItemMargins(float*, float*, float*, float*) + const; + + int State(BMenuItem** item = NULL) const; + + void Install(BWindow* window); + void Uninstall(); + void SetSuper(BMenu* menu); + void SetSuperItem(BMenuItem* item); + void InvokeItem(BMenuItem* item, bool now = false); + void QuitTracking(bool thisMenuOnly = true); + + static status_t CreateBitmaps(); + static void DeleteBitmaps(); + + static const BBitmap* MenuItemShift(); + static const BBitmap* MenuItemControl(); + static const BBitmap* MenuItemOption(); + static const BBitmap* MenuItemCommand(); + static const BBitmap* MenuItemMenu(); - static const BBitmap *MenuItemShift(); - static const BBitmap *MenuItemControl(); - static const BBitmap *MenuItemOption(); - static const BBitmap *MenuItemCommand(); - static const BBitmap *MenuItemMenu(); private: - BMenu *fMenu; + BMenu* fMenu; - static BBitmap *sMenuItemShift; - static BBitmap *sMenuItemControl; - static BBitmap *sMenuItemOption; - static BBitmap *sMenuItemAlt; - static BBitmap *sMenuItemMenu; + static BBitmap* sMenuItemShift; + static BBitmap* sMenuItemControl; + static BBitmap* sMenuItemOption; + static BBitmap* sMenuItemAlt; + static BBitmap* sMenuItemMenu; }; - -}; +}; // namespace BPrivate -// Note: since sqrt is slow, we don't use it and return the square of the distance +// Note: since sqrt is slow, we don't use it and return the square of the +// distance #define square(x) ((x) * (x)) static inline float point_distance(const BPoint &pointA, const BPoint &pointB) { return square(pointA.x - pointB.x) + square(pointA.y - pointB.y); } - #undef square -#endif // __MENU_PRIVATE_H +#endif // __MENU_PRIVATE_H