* Added const version of GetLimits() (the non-const version is still around
for binary compatibility). * Always round the bar thickness, or we get drawing artefacts. * Cleaned up the header following our coding style. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30070 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
+153
-147
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2001-2006, Haiku.
|
* Copyright 2001-2009, Haiku.
|
||||||
* Distributed under the terms of the MIT License.
|
* Distributed under the terms of the MIT License.
|
||||||
*
|
*
|
||||||
* Authors:
|
* Authors:
|
||||||
@@ -28,199 +28,205 @@ enum thumb_style {
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
#define USE_OFF_SCREEN_VIEW 1
|
|
||||||
|
|
||||||
|
|
||||||
class BSlider : public BControl {
|
class BSlider : public BControl {
|
||||||
public:
|
public:
|
||||||
BSlider(BRect frame, const char *name, const char *label,
|
BSlider(BRect frame, const char* name,
|
||||||
BMessage *message, int32 minValue, int32 maxValue,
|
const char* label, BMessage* message,
|
||||||
thumb_style thumbType = B_BLOCK_THUMB,
|
int32 minValue, int32 maxValue,
|
||||||
uint32 resizingMode = B_FOLLOW_LEFT | B_FOLLOW_TOP,
|
thumb_style thumbType = B_BLOCK_THUMB,
|
||||||
uint32 flags = B_NAVIGABLE | B_WILL_DRAW | B_FRAME_EVENTS);
|
uint32 resizingMode
|
||||||
|
= B_FOLLOW_LEFT | B_FOLLOW_TOP,
|
||||||
|
uint32 flags = B_NAVIGABLE | B_WILL_DRAW
|
||||||
|
| B_FRAME_EVENTS);
|
||||||
|
|
||||||
BSlider(BRect frame, const char *name, const char *label,
|
BSlider(BRect frame, const char* name,
|
||||||
BMessage *message, int32 minValue, int32 maxValue,
|
const char* label, BMessage* message,
|
||||||
orientation posture, thumb_style thumbType = B_BLOCK_THUMB,
|
int32 minValue, int32 maxValue,
|
||||||
uint32 resizingMode = B_FOLLOW_LEFT | B_FOLLOW_TOP,
|
orientation posture,
|
||||||
uint32 flags = B_NAVIGABLE | B_WILL_DRAW | B_FRAME_EVENTS);
|
thumb_style thumbType = B_BLOCK_THUMB,
|
||||||
|
uint32 resizingMode
|
||||||
|
= B_FOLLOW_LEFT | B_FOLLOW_TOP,
|
||||||
|
uint32 flags = B_NAVIGABLE | B_WILL_DRAW
|
||||||
|
| B_FRAME_EVENTS);
|
||||||
|
|
||||||
BSlider(const char *name, const char *label,
|
BSlider(const char* name, const char* label,
|
||||||
BMessage *message, int32 minValue, int32 maxValue,
|
BMessage* message, int32 minValue,
|
||||||
orientation posture, thumb_style thumbType = B_BLOCK_THUMB,
|
int32 maxValue, orientation posture,
|
||||||
uint32 flags = B_NAVIGABLE | B_WILL_DRAW | B_FRAME_EVENTS);
|
thumb_style thumbType = B_BLOCK_THUMB,
|
||||||
|
uint32 flags = B_NAVIGABLE | B_WILL_DRAW
|
||||||
|
| B_FRAME_EVENTS);
|
||||||
|
|
||||||
BSlider(BMessage *data);
|
BSlider(BMessage* data);
|
||||||
virtual ~BSlider();
|
virtual ~BSlider();
|
||||||
|
|
||||||
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 status_t Perform(perform_code code, void* data);
|
virtual status_t Perform(perform_code code, void* data);
|
||||||
|
|
||||||
virtual void WindowActivated(bool state);
|
virtual void WindowActivated(bool state);
|
||||||
virtual void AttachedToWindow();
|
virtual void AttachedToWindow();
|
||||||
virtual void AllAttached();
|
virtual void AllAttached();
|
||||||
virtual void AllDetached();
|
virtual void AllDetached();
|
||||||
virtual void DetachedFromWindow();
|
virtual void DetachedFromWindow();
|
||||||
|
|
||||||
virtual void MessageReceived(BMessage *msg);
|
virtual void MessageReceived(BMessage* message);
|
||||||
virtual void FrameMoved(BPoint new_position);
|
virtual void FrameMoved(BPoint newPosition);
|
||||||
virtual void FrameResized(float w,float h);
|
virtual void FrameResized(float width, float height);
|
||||||
virtual void KeyDown(const char * bytes, int32 n);
|
virtual void KeyDown(const char* bytes, int32 numBytes);
|
||||||
virtual void MouseDown(BPoint);
|
virtual void MouseDown(BPoint point);
|
||||||
virtual void MouseUp(BPoint pt);
|
virtual void MouseUp(BPoint point);
|
||||||
virtual void MouseMoved(BPoint pt, uint32 c, const BMessage *m);
|
virtual void MouseMoved(BPoint point, uint32 transit,
|
||||||
virtual void Pulse();
|
const BMessage* dragMessage);
|
||||||
|
virtual void Pulse();
|
||||||
|
|
||||||
virtual void SetLabel(const char *label);
|
virtual void SetLabel(const char* label);
|
||||||
virtual void SetLimitLabels(const char *minLabel,
|
virtual void SetLimitLabels(const char* minLabel,
|
||||||
const char *maxLabel);
|
const char* maxLabel);
|
||||||
const char* MinLimitLabel() const;
|
const char* MinLimitLabel() const;
|
||||||
const char* MaxLimitLabel() const;
|
const char* MaxLimitLabel() const;
|
||||||
virtual void SetValue(int32);
|
virtual void SetValue(int32);
|
||||||
virtual int32 ValueForPoint(BPoint) const;
|
virtual int32 ValueForPoint(BPoint) const;
|
||||||
virtual void SetPosition(float);
|
virtual void SetPosition(float);
|
||||||
float Position() const;
|
float Position() const;
|
||||||
virtual void SetEnabled(bool on);
|
virtual void SetEnabled(bool on);
|
||||||
void GetLimits(int32 * minimum, int32 * maximum);
|
void GetLimits(int32* minimum, int32* maximum) const;
|
||||||
|
|
||||||
virtual void Draw(BRect);
|
virtual void Draw(BRect);
|
||||||
virtual void DrawSlider();
|
virtual void DrawSlider();
|
||||||
virtual void DrawBar();
|
virtual void DrawBar();
|
||||||
virtual void DrawHashMarks();
|
virtual void DrawHashMarks();
|
||||||
virtual void DrawThumb();
|
virtual void DrawThumb();
|
||||||
virtual void DrawFocusMark();
|
virtual void DrawFocusMark();
|
||||||
virtual void DrawText();
|
virtual void DrawText();
|
||||||
virtual const char* UpdateText() const;
|
virtual const char* UpdateText() const;
|
||||||
void UpdateTextChanged();
|
void UpdateTextChanged();
|
||||||
|
|
||||||
virtual BRect BarFrame() const;
|
virtual BRect BarFrame() const;
|
||||||
virtual BRect HashMarksFrame() const;
|
virtual BRect HashMarksFrame() const;
|
||||||
virtual BRect ThumbFrame() const;
|
virtual BRect ThumbFrame() const;
|
||||||
|
|
||||||
virtual void SetFlags(uint32 flags);
|
virtual void SetFlags(uint32 flags);
|
||||||
virtual void SetResizingMode(uint32 mode);
|
virtual void SetResizingMode(uint32 mode);
|
||||||
|
|
||||||
virtual void GetPreferredSize( float *width, float *height);
|
virtual void GetPreferredSize(float* width, float* height);
|
||||||
virtual void ResizeToPreferred();
|
virtual void ResizeToPreferred();
|
||||||
|
|
||||||
virtual status_t Invoke(BMessage *msg=NULL);
|
virtual status_t Invoke(BMessage* message = NULL);
|
||||||
virtual BHandler* ResolveSpecifier(BMessage *msg, int32 index,
|
virtual BHandler* ResolveSpecifier(BMessage* message, int32 index,
|
||||||
BMessage *specifier, int32 form,
|
BMessage* specifier, int32 form,
|
||||||
const char *property);
|
const char* property);
|
||||||
virtual status_t GetSupportedSuites(BMessage* data);
|
virtual status_t GetSupportedSuites(BMessage* data);
|
||||||
|
|
||||||
virtual void SetModificationMessage(BMessage *message);
|
virtual void SetModificationMessage(BMessage* message);
|
||||||
BMessage* ModificationMessage() const;
|
BMessage* ModificationMessage() const;
|
||||||
|
|
||||||
virtual void SetSnoozeAmount(int32);
|
virtual void SetSnoozeAmount(int32);
|
||||||
int32 SnoozeAmount() const;
|
int32 SnoozeAmount() const;
|
||||||
|
|
||||||
virtual void SetKeyIncrementValue(int32 value);
|
virtual void SetKeyIncrementValue(int32 value);
|
||||||
int32 KeyIncrementValue() const;
|
int32 KeyIncrementValue() const;
|
||||||
|
|
||||||
virtual void SetHashMarkCount(int32 count);
|
virtual void SetHashMarkCount(int32 count);
|
||||||
int32 HashMarkCount() const;
|
int32 HashMarkCount() const;
|
||||||
|
|
||||||
virtual void SetHashMarks(hash_mark_location where);
|
virtual void SetHashMarks(hash_mark_location where);
|
||||||
hash_mark_location HashMarks() const;
|
hash_mark_location HashMarks() const;
|
||||||
|
|
||||||
virtual void SetStyle(thumb_style s);
|
virtual void SetStyle(thumb_style style);
|
||||||
thumb_style Style() const;
|
thumb_style Style() const;
|
||||||
|
|
||||||
virtual void SetBarColor(rgb_color);
|
virtual void SetBarColor(rgb_color color);
|
||||||
rgb_color BarColor() const;
|
rgb_color BarColor() const;
|
||||||
virtual void UseFillColor(bool, const rgb_color* c=NULL);
|
virtual void UseFillColor(bool useFill,
|
||||||
bool FillColor(rgb_color*) const;
|
const rgb_color* color = NULL);
|
||||||
|
bool FillColor(rgb_color* color) const;
|
||||||
|
|
||||||
BView* OffscreenView() const;
|
BView* OffscreenView() const;
|
||||||
|
|
||||||
orientation Orientation() const;
|
orientation Orientation() const;
|
||||||
virtual void SetOrientation(orientation);
|
virtual void SetOrientation(orientation);
|
||||||
|
|
||||||
float BarThickness() const;
|
float BarThickness() const;
|
||||||
virtual void SetBarThickness(float thickness);
|
virtual void SetBarThickness(float thickness);
|
||||||
|
|
||||||
virtual void SetFont(const BFont *font,
|
virtual void SetFont(const BFont* font,
|
||||||
uint32 properties = B_FONT_ALL);
|
uint32 properties = B_FONT_ALL);
|
||||||
|
|
||||||
virtual void SetLimits(int32 minimum, int32 maximum);
|
virtual void SetLimits(int32 minimum, int32 maximum);
|
||||||
|
|
||||||
virtual float MaxUpdateTextWidth();
|
virtual float MaxUpdateTextWidth();
|
||||||
|
|
||||||
virtual void InvalidateLayout(bool descendants = false);
|
virtual void InvalidateLayout(bool descendants = false);
|
||||||
|
|
||||||
virtual BSize MinSize();
|
virtual BSize MinSize();
|
||||||
virtual BSize MaxSize();
|
virtual BSize MaxSize();
|
||||||
virtual BSize PreferredSize();
|
virtual BSize PreferredSize();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void _DrawBlockThumb();
|
// deprecated leftover of BeOS compatibility
|
||||||
void _DrawTriangleThumb();
|
void GetLimits(int32* minimum, int32* maximum);
|
||||||
|
|
||||||
BPoint _Location() const;
|
void _DrawBlockThumb();
|
||||||
void _SetLocation(BPoint p);
|
void _DrawTriangleThumb();
|
||||||
|
|
||||||
float _MinPosition() const;
|
BPoint _Location() const;
|
||||||
float _MaxPosition() const;
|
void _SetLocation(BPoint point);
|
||||||
bool _ConstrainPoint(BPoint& point, BPoint compare) const;
|
|
||||||
|
|
||||||
BSize _ValidateMinSize();
|
float _MinPosition() const;
|
||||||
|
float _MaxPosition() const;
|
||||||
|
bool _ConstrainPoint(BPoint& point,
|
||||||
|
BPoint compare) const;
|
||||||
|
|
||||||
virtual void _ReservedSlider6();
|
BSize _ValidateMinSize();
|
||||||
virtual void _ReservedSlider7();
|
|
||||||
virtual void _ReservedSlider8();
|
|
||||||
virtual void _ReservedSlider9();
|
|
||||||
virtual void _ReservedSlider10();
|
|
||||||
virtual void _ReservedSlider11();
|
|
||||||
virtual void _ReservedSlider12();
|
|
||||||
|
|
||||||
BSlider& operator=(const BSlider &);
|
virtual void _ReservedSlider6();
|
||||||
|
virtual void _ReservedSlider7();
|
||||||
|
virtual void _ReservedSlider8();
|
||||||
|
virtual void _ReservedSlider9();
|
||||||
|
virtual void _ReservedSlider10();
|
||||||
|
virtual void _ReservedSlider11();
|
||||||
|
virtual void _ReservedSlider12();
|
||||||
|
|
||||||
void _InitBarColor();
|
BSlider& operator=(const BSlider& other);
|
||||||
void _InitObject();
|
|
||||||
|
|
||||||
private:
|
void _InitBarColor();
|
||||||
BMessage* fModificationMessage;
|
void _InitObject();
|
||||||
int32 fSnoozeAmount;
|
|
||||||
|
|
||||||
rgb_color fBarColor;
|
private:
|
||||||
rgb_color fFillColor;
|
BMessage* fModificationMessage;
|
||||||
bool fUseFillColor;
|
int32 fSnoozeAmount;
|
||||||
|
|
||||||
char* fMinLimitLabel;
|
rgb_color fBarColor;
|
||||||
char* fMaxLimitLabel;
|
rgb_color fFillColor;
|
||||||
const char* fUpdateText;
|
bool fUseFillColor;
|
||||||
|
|
||||||
int32 fMinValue;
|
char* fMinLimitLabel;
|
||||||
int32 fMaxValue;
|
char* fMaxLimitLabel;
|
||||||
int32 fKeyIncrementValue;
|
const char* fUpdateText;
|
||||||
|
|
||||||
int32 fHashMarkCount;
|
int32 fMinValue;
|
||||||
hash_mark_location fHashMarks;
|
int32 fMaxValue;
|
||||||
|
int32 fKeyIncrementValue;
|
||||||
|
|
||||||
#if USE_OFF_SCREEN_VIEW
|
int32 fHashMarkCount;
|
||||||
BBitmap* fOffScreenBits;
|
hash_mark_location fHashMarks;
|
||||||
BView* fOffScreenView;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
thumb_style fStyle;
|
BBitmap* fOffScreenBits;
|
||||||
|
BView* fOffScreenView;
|
||||||
|
|
||||||
BPoint fLocation;
|
thumb_style fStyle;
|
||||||
BPoint fInitialLocation;
|
|
||||||
|
|
||||||
orientation fOrientation;
|
BPoint fLocation;
|
||||||
float fBarThickness;
|
BPoint fInitialLocation;
|
||||||
|
|
||||||
BSize fMinSize;
|
orientation fOrientation;
|
||||||
|
float fBarThickness;
|
||||||
|
|
||||||
float fMaxUpdateTextWidth;
|
BSize fMinSize;
|
||||||
|
|
||||||
#if USE_OFF_SCREEN_VIEW
|
float fMaxUpdateTextWidth;
|
||||||
uint32 _reserved[4];
|
|
||||||
#else
|
uint32 _reserved[4];
|
||||||
uint32 _reserved[6];
|
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // _SLIDER_H
|
#endif // _SLIDER_H
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2001-2006, Haiku.
|
* Copyright 2001-2009, Haiku.
|
||||||
* Distributed under the terms of the MIT License.
|
* Distributed under the terms of the MIT License.
|
||||||
*
|
*
|
||||||
* Authors:
|
* Authors:
|
||||||
@@ -27,6 +27,9 @@
|
|||||||
#include <binary_compatibility/Interface.h>
|
#include <binary_compatibility/Interface.h>
|
||||||
|
|
||||||
|
|
||||||
|
#define USE_OFF_SCREEN_VIEW 1
|
||||||
|
|
||||||
|
|
||||||
BSlider::BSlider(BRect frame, const char* name, const char* label,
|
BSlider::BSlider(BRect frame, const char* name, const char* label,
|
||||||
BMessage* message, int32 minValue, int32 maxValue,
|
BMessage* message, int32 minValue, int32 maxValue,
|
||||||
thumb_style thumbType, uint32 resizingMode, uint32 flags)
|
thumb_style thumbType, uint32 resizingMode, uint32 flags)
|
||||||
@@ -777,11 +780,24 @@ BSlider::SetEnabled(bool on)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void
|
||||||
|
BSlider::GetLimits(int32 *minimum, int32 *maximum) const
|
||||||
|
{
|
||||||
|
if (minimum != NULL)
|
||||||
|
*minimum = fMinValue;
|
||||||
|
if (maximum != NULL)
|
||||||
|
*maximum = fMaxValue;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//! This one is deprecated, and only left for binary compatiblity (it's private)
|
||||||
void
|
void
|
||||||
BSlider::GetLimits(int32 *minimum, int32 *maximum)
|
BSlider::GetLimits(int32 *minimum, int32 *maximum)
|
||||||
{
|
{
|
||||||
*minimum = fMinValue;
|
if (minimum != NULL)
|
||||||
*maximum = fMaxValue;
|
*minimum = fMinValue;
|
||||||
|
if (maximum != NULL)
|
||||||
|
*maximum = fMaxValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -1594,6 +1610,9 @@ BSlider::SetBarThickness(float thickness)
|
|||||||
{
|
{
|
||||||
if (thickness < 1.0)
|
if (thickness < 1.0)
|
||||||
thickness = 1.0;
|
thickness = 1.0;
|
||||||
|
else
|
||||||
|
thickness = roundf(thickness);
|
||||||
|
|
||||||
if (thickness != fBarThickness) {
|
if (thickness != fBarThickness) {
|
||||||
// calculate invalid barframe and extend by hashmark size
|
// calculate invalid barframe and extend by hashmark size
|
||||||
float hInset = 0.0;
|
float hInset = 0.0;
|
||||||
|
|||||||
Reference in New Issue
Block a user