Updated indentation style.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32690 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2009-08-26 10:45:36 +00:00
parent 87ba0eaa2b
commit aaa6b1228a
2 changed files with 110 additions and 104 deletions
+30 -26
View File
@@ -1,6 +1,6 @@
/* /*
* Copyright 2006-2007, Haiku, Inc. All Rights Reserved. * Copyright 2006-2009, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT license.
*/ */
#ifndef _DESKBAR_H #ifndef _DESKBAR_H
#define _DESKBAR_H #define _DESKBAR_H
@@ -24,35 +24,39 @@ enum deskbar_location {
}; };
class BDeskbar { class BDeskbar {
public: public:
BDeskbar(); BDeskbar();
~BDeskbar(); ~BDeskbar();
bool IsRunning() const; bool IsRunning() const;
// Location member functions // Location member functions
BRect Frame() const; BRect Frame() const;
deskbar_location Location(bool* _isExpanded = NULL) const; deskbar_location Location(bool* _isExpanded = NULL) const;
status_t SetLocation(deskbar_location location, bool expanded = false); status_t SetLocation(deskbar_location location,
bool IsExpanded() const; bool expanded = false);
status_t Expand(bool expand); bool IsExpanded() const;
status_t Expand(bool expand);
// Item querying member functions // Item querying member functions
status_t GetItemInfo(int32 id, const char** _name) const; status_t GetItemInfo(int32 id,
status_t GetItemInfo(const char* name, int32* _id) const; const char** _name) const;
bool HasItem(int32 id) const; status_t GetItemInfo(const char* name,
bool HasItem(const char* name) const; int32* _id) const;
uint32 CountItems() const; bool HasItem(int32 id) const;
bool HasItem(const char* name) const;
uint32 CountItems() const;
// Item modification member functions // Item modification member functions
status_t AddItem(BView* archivableView, int32* _id = NULL); status_t AddItem(BView* archivableView,
status_t AddItem(entry_ref* addOn, int32* _id = NULL); int32* _id = NULL);
status_t RemoveItem(int32 id); status_t AddItem(entry_ref* addOn, int32* _id = NULL);
status_t RemoveItem(const char* name); status_t RemoveItem(int32 id);
status_t RemoveItem(const char* name);
private: private:
BMessenger* fMessenger; BMessenger* fMessenger;
uint32 _reserved[12]; uint32 _reserved[12];
}; };
#endif // _DESKBAR_H #endif // _DESKBAR_H
+80 -78
View File
@@ -1,6 +1,6 @@
/* /*
* Copyright 2006-2009, Haiku, Inc. All Rights Reserved. * Copyright 2006-2009, Haiku, Inc. All Rights Reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT license.
*/ */
#ifndef _DRAGGER_H #ifndef _DRAGGER_H
#define _DRAGGER_H #define _DRAGGER_H
@@ -22,102 +22,104 @@ namespace BPrivate {
class BDragger : public BView { class BDragger : public BView {
public: public:
BDragger(BRect bounds, BView* target, BDragger(BRect bounds, BView* target,
uint32 resizingMask = B_FOLLOW_NONE, uint32 resizingMask = B_FOLLOW_NONE,
uint32 flags = B_WILL_DRAW); uint32 flags = B_WILL_DRAW);
BDragger(BMessage* data); BDragger(BMessage* data);
virtual ~BDragger(); virtual ~BDragger();
static BArchivable* Instantiate(BMessage* data); static BArchivable* Instantiate(BMessage* data);
virtual status_t Archive(BMessage* data, bool deep = true) const; virtual status_t Archive(BMessage* data,
bool deep = true) const;
virtual void AttachedToWindow(); virtual void AttachedToWindow();
virtual void DetachedFromWindow(); virtual void DetachedFromWindow();
virtual void Draw(BRect updateRect); virtual void Draw(BRect updateRect);
virtual void MouseDown(BPoint where); virtual void MouseDown(BPoint where);
virtual void MouseUp(BPoint where); virtual void MouseUp(BPoint where);
virtual void MouseMoved(BPoint where, uint32 transit, virtual void MouseMoved(BPoint where, uint32 transit,
const BMessage* dragMessage); const BMessage* dragMessage);
virtual void MessageReceived(BMessage* message); virtual void MessageReceived(BMessage* message);
virtual void FrameMoved(BPoint newPosition); virtual void FrameMoved(BPoint newPosition);
virtual void FrameResized(float newWidth, float newHeight); virtual void FrameResized(float newWidth, float newHeight);
static status_t ShowAllDraggers(); static status_t ShowAllDraggers();
static status_t HideAllDraggers(); static status_t HideAllDraggers();
static bool AreDraggersDrawn(); static bool AreDraggersDrawn();
virtual BHandler* ResolveSpecifier(BMessage* message, int32 index, virtual BHandler* ResolveSpecifier(BMessage* message,
BMessage* specifier, int32 form, int32 index, BMessage* specifier,
const char* property); int32 form, const char* property);
virtual status_t GetSupportedSuites(BMessage* data); virtual status_t GetSupportedSuites(BMessage* data);
virtual status_t Perform(perform_code d, void* arg); virtual status_t Perform(perform_code code, void* data);
virtual void ResizeToPreferred(); virtual void ResizeToPreferred();
virtual void GetPreferredSize(float* _width, float* _height); virtual void GetPreferredSize(float* _width,
virtual void MakeFocus(bool focus = true); float* _height);
virtual void AllAttached(); virtual void MakeFocus(bool focus = true);
virtual void AllDetached(); virtual void AllAttached();
virtual void AllDetached();
status_t SetPopUp(BPopUpMenu* contextMenu); status_t SetPopUp(BPopUpMenu* contextMenu);
BPopUpMenu* PopUp() const; BPopUpMenu* PopUp() const;
bool InShelf() const; bool InShelf() const;
BView* Target() const; BView* Target() const;
virtual BBitmap* DragBitmap(BPoint* offset, drawing_mode *mode); virtual BBitmap* DragBitmap(BPoint* offset, drawing_mode* mode);
class Private; class Private;
protected: protected:
bool IsVisibilityChanging() const; bool IsVisibilityChanging() const;
private: private:
friend class BPrivate::ShelfContainerViewFilter; friend class BPrivate::ShelfContainerViewFilter;
friend class BPrivate::replicant_data; friend class BPrivate::replicant_data;
friend class Private; friend class Private;
friend class BShelf; friend class BShelf;
virtual void _ReservedDragger2(); virtual void _ReservedDragger2();
virtual void _ReservedDragger3(); virtual void _ReservedDragger3();
virtual void _ReservedDragger4(); virtual void _ReservedDragger4();
static void _UpdateShowAllDraggers(bool visible); static void _UpdateShowAllDraggers(bool visible);
BDragger& operator=(const BDragger& other); BDragger& operator=(const BDragger& other);
void _AddToList(); void _AddToList();
void _RemoveFromList(); void _RemoveFromList();
status_t _DetermineRelationship(); status_t _DetermineRelationship();
status_t _SetViewToDrag(BView* target); status_t _SetViewToDrag(BView* target);
void _SetShelf(BShelf* shelf); void _SetShelf(BShelf* shelf);
void _SetZombied(bool state); void _SetZombied(bool state);
void _BuildDefaultPopUp(); void _BuildDefaultPopUp();
void _ShowPopUp(BView* target, BPoint where); void _ShowPopUp(BView* target, BPoint where);
static bool sVisible; static bool sVisible;
static bool sVisibleInitialized; static bool sVisibleInitialized;
static BLocker sLock; static BLocker sLock;
static BList sList; static BList sList;
enum relation { enum relation {
TARGET_UNKNOWN, TARGET_UNKNOWN,
TARGET_IS_CHILD, TARGET_IS_CHILD,
TARGET_IS_PARENT, TARGET_IS_PARENT,
TARGET_IS_SIBLING TARGET_IS_SIBLING
}; };
BView* fTarget; BView* fTarget;
relation fRelation; relation fRelation;
BShelf* fShelf; BShelf* fShelf;
bool fTransition; bool fTransition;
bool fIsZombie; bool fIsZombie;
char fErrCount; char fErrCount;
bool fPopUpIsCustom; bool fPopUpIsCustom;
BBitmap* fBitmap; BBitmap* fBitmap;
BPopUpMenu* fPopUp; BPopUpMenu* fPopUp;
uint32 _reserved[3]; uint32 _reserved[3];
}; };
#endif /* _DRAGGER_H */ #endif /* _DRAGGER_H */