* Made B_V_SCROLL_BAR_WIDTH & B_H_SCROLL_BAR_HEIGHT float constants.

* Added a TODO to some stuff that probably shouldn't be in a public header.
* Cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18174 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-07-17 19:18:38 +00:00
parent 2f13f213de
commit 2ee47d3ff9
+40 -56
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2001-2005, Haiku, Inc. * Copyright (c) 2001-2006, Haiku, Inc.
* Distributed under the terms of the MIT license. * Distributed under the terms of the MIT license.
* *
* Authors: * Authors:
@@ -8,47 +8,39 @@
* Stefano Ceccherini ([email protected]) * Stefano Ceccherini ([email protected])
* Stephan Aßmus <[email protected]> * Stephan Aßmus <[email protected]>
*/ */
#ifndef _SCROLL_BAR_H #ifndef _SCROLL_BAR_H
#define _SCROLL_BAR_H #define _SCROLL_BAR_H
#include <BeBuild.h> #include <BeBuild.h>
#include <View.h> #include <View.h>
//----------------------------------------------------------------
//----- scroll bar defines ---------------------------------------
#define B_V_SCROLL_BAR_WIDTH 14.0 #define B_V_SCROLL_BAR_WIDTH 14.0f
#define B_H_SCROLL_BAR_HEIGHT 14.0 #define B_H_SCROLL_BAR_HEIGHT 14.0f
// TODO: shouldn't these be moved into the implementation?
#define SCROLL_BAR_MAXIMUM_KNOB_SIZE 50 #define SCROLL_BAR_MAXIMUM_KNOB_SIZE 50
#define SCROLL_BAR_MINIMUM_KNOB_SIZE 9 #define SCROLL_BAR_MINIMUM_KNOB_SIZE 9
#define DISABLES_ON_WINDOW_DEACTIVATION 1 #define DISABLES_ON_WINDOW_DEACTIVATION 1
//----------------------------------------------------------------
//----- BScrollBar class -----------------------------------------
class BScrollBar : public BView { class BScrollBar : public BView {
public:
public: BScrollBar(BRect frame, const char *name, BView *target,
BScrollBar( BRect frame, float min, float max, orientation direction);
const char *name,
BView *target,
float min,
float max,
orientation direction);
BScrollBar(BMessage *data); BScrollBar(BMessage *data);
virtual ~BScrollBar(); virtual ~BScrollBar();
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();
void SetValue(float value); void SetValue(float value);
float Value() const; float Value() const;
void SetProportion(float); void SetProportion(float);
float Proportion() const; float Proportion() const;
virtual void ValueChanged(float newValue); virtual void ValueChanged(float newValue);
void SetRange(float min, float max); void SetRange(float min, float max);
void GetRange(float *min, float *max) const; void GetRange(float *min, float *max) const;
@@ -59,46 +51,43 @@ virtual void ValueChanged(float newValue);
BView *Target() const; BView *Target() const;
orientation Orientation() const; orientation Orientation() const;
virtual void MessageReceived(BMessage *msg); virtual void MessageReceived(BMessage *msg);
virtual void MouseDown(BPoint pt); virtual void MouseDown(BPoint pt);
virtual void MouseUp(BPoint pt); virtual void MouseUp(BPoint pt);
virtual void MouseMoved(BPoint pt, uint32 code, const BMessage *msg); virtual void MouseMoved(BPoint pt, uint32 code, const BMessage *msg);
virtual void DetachedFromWindow(); virtual void DetachedFromWindow();
virtual void Draw(BRect updateRect); virtual void Draw(BRect updateRect);
virtual void FrameMoved(BPoint new_position); virtual void FrameMoved(BPoint new_position);
virtual void FrameResized(float new_width, float new_height); virtual void FrameResized(float new_width, float new_height);
virtual BHandler *ResolveSpecifier(BMessage *msg, virtual BHandler *ResolveSpecifier(BMessage *msg, int32 index,
int32 index, BMessage *specifier, int32 form,
BMessage *specifier,
int32 form,
const char *property); const char *property);
virtual void ResizeToPreferred(); virtual void ResizeToPreferred();
virtual void GetPreferredSize(float *width, float *height); virtual void GetPreferredSize(float *width, float *height);
virtual void MakeFocus(bool state = true); virtual void MakeFocus(bool state = true);
virtual void AllAttached(); virtual void AllAttached();
virtual void AllDetached(); virtual void AllDetached();
virtual status_t GetSupportedSuites(BMessage *data); virtual status_t GetSupportedSuites(BMessage *data);
virtual status_t Perform(perform_code d, void *arg);
//----- Private or reserved -----------------------------------------
virtual status_t Perform(perform_code d, void *arg);
#if DISABLES_ON_WINDOW_DEACTIVATION #if DISABLES_ON_WINDOW_DEACTIVATION
virtual void WindowActivated(bool active); virtual void WindowActivated(bool active);
#endif #endif
private: private:
class Private; class Private;
friend class Private; friend class Private;
friend status_t control_scrollbar(scroll_bar_info *info, BScrollBar *bar); // for use within the preflet friend status_t control_scrollbar(scroll_bar_info *info, BScrollBar *bar);
// for use within the preflet
virtual void _ReservedScrollBar1(); virtual void _ReservedScrollBar1();
virtual void _ReservedScrollBar2(); virtual void _ReservedScrollBar2();
virtual void _ReservedScrollBar3(); virtual void _ReservedScrollBar3();
virtual void _ReservedScrollBar4(); virtual void _ReservedScrollBar4();
BScrollBar &operator=(const BScrollBar &); BScrollBar &operator=(const BScrollBar &);
@@ -110,12 +99,10 @@ virtual void _ReservedScrollBar4();
void _UpdateTargetValue(BPoint where); void _UpdateTargetValue(BPoint where);
void _UpdateArrowButtons(); void _UpdateArrowButtons();
void _DrawDisabledBackground(BRect area, void _DrawDisabledBackground(BRect area,
const rgb_color& light, const rgb_color& light, const rgb_color& dark,
const rgb_color& dark,
const rgb_color& fill); const rgb_color& fill);
void _DrawArrowButton(int32 direction, void _DrawArrowButton(int32 direction,
bool doubleArrows, bool doubleArrows, BRect frame,
BRect frame,
const BRect& updateRect, const BRect& updateRect,
bool enabled, bool down); bool enabled, bool down);
@@ -134,7 +121,4 @@ virtual void _ReservedScrollBar4();
uint32 _reserved[3]; uint32 _reserved[3];
}; };
//-------------------------------------------------------------
//-------------------------------------------------------------
#endif // _SCROLL_BAR_H #endif // _SCROLL_BAR_H