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

Deskbar: A few style fixes to DeskbarMenu

Browse Source
This commit is contained in:
John Scipione
2014-06-21 02:49:50 -04:00
parent 91faf3201b
commit 088a9620a0
1 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/deskbar/DeskbarMenu.cpp
+11 -17
View File
@@ -65,26 +65,23 @@ All rights reserved.
#define ROSTER_SIG "application/x-vnd.Be-ROST" #define ROSTER_SIG "application/x-vnd.Be-ROST"
#ifdef MOUNT_MENU_IN_DESKBAR #ifdef MOUNT_MENU_IN_DESKBAR
class DeskbarMountMenu : public BPrivate::MountMenu { class DeskbarMountMenu : public BPrivate::MountMenu {
public: public:
DeskbarMountMenu(const char* name); DeskbarMountMenu(const char* name);
virtual bool AddDynamicItem(add_state s); virtual bool AddDynamicItem(add_state s);
}; };
#endif // MOUNT_MENU_IN_DESKBAR
#endif //#define SHOW_RECENT_FIND_ITEMS
// #define SHOW_RECENT_FIND_ITEMS
namespace BPrivate { namespace BPrivate {
BMenu* TrackerBuildRecentFindItemsMenu(const char*); BMenu* TrackerBuildRecentFindItemsMenu(const char*);
} }
using namespace BPrivate; using namespace BPrivate;
// #pragma mark - // #pragma mark - TDeskbarMenu
TDeskbarMenu::TDeskbarMenu(TBarView* barView) TDeskbarMenu::TDeskbarMenu(TBarView* barView)
@@ -99,7 +96,7 @@ TDeskbarMenu::TDeskbarMenu(TBarView* barView)
void void
TDeskbarMenu::AttachedToWindow() TDeskbarMenu::AttachedToWindow()
{ {
if (fBarView && fBarView->LockLooper()) { if (fBarView != NULL && fBarView->LockLooper()) {
if (fBarView->Dragging()) { if (fBarView->Dragging()) {
SetTypesList(fBarView->CachedTypesList()); SetTypesList(fBarView->CachedTypesList());
SetTarget(BMessenger(fBarView)); SetTarget(BMessenger(fBarView));
@@ -122,9 +119,9 @@ TDeskbarMenu::AttachedToWindow()
void void
TDeskbarMenu::DetachedFromWindow() TDeskbarMenu::DetachedFromWindow()
{ {
if (fBarView) { if (fBarView != NULL) {
BLooper* looper = fBarView->Looper(); BLooper* looper = fBarView->Looper();
if (looper && looper->Lock()) { if (looper != NULL && looper->Lock()) {
fBarView->DragStop(); fBarView->DragStop();
looper->Unlock(); looper->Unlock();
} }
@@ -656,12 +653,10 @@ TRecentsMenu::ResetTargets()
} }
//***************************************************************************** // #pragma mark - DeskbarMountMenu
// #pragma mark -
#ifdef MOUNT_MENU_IN_DESKBAR #ifdef MOUNT_MENU_IN_DESKBAR
DeskbarMountMenu::DeskbarMountMenu(const char* name) DeskbarMountMenu::DeskbarMountMenu(const char* name)
: BPrivate::MountMenu(name) : BPrivate::MountMenu(name)
{ {
@@ -678,5 +673,4 @@ DeskbarMountMenu::AddDynamicItem(add_state s)
return false; return false;
} }
#endif // MOUNT_MENU_IN_DESKBAR
#endif