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

* don't remember what this was for, I think it elliminates flickering,

Browse Source 
because the SeekSlider knows if the knob position actually changed


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18634 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2006-08-26 13:55:18 +00:00
parent 5fc2ff880a
commit 67ca1dc6aa
2 changed files with 60 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/mediaplayer/SeekSlider.cpp
+57 -20
View File
@@ -34,6 +34,7 @@ SeekSlider::SeekSlider(BRect frame, const char* name, BMessage* message,
: BControl(frame, name, NULL, message, B_FOLLOW_NONE,
B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE),
fTracking(false),
fKnobPos(_KnobPosFor(Bounds(), Value())),
fMinValue(minValue),
fMaxValue(maxValue)
{
@@ -62,21 +63,38 @@ SeekSlider::SetValue(int32 value)
if (value == Value())
return;
#if __HAIKU__
BControl::SetValueNoUpdate(value);
#else
BControl::SetValue(value);
#endif
Invoke();
#if __HAIKU__
int32 oldKnobPos = fKnobPos;
fKnobPos = _KnobPosFor(Bounds(), Value());
// invalidate
if (oldKnobPos != fKnobPos) {
float knobWidth2 = SEEK_SLIDER_KNOB_WIDTH / 2.0;
BRect oldKnob(Bounds());
BRect newKnob(oldKnob);
oldKnob.left = oldKnobPos - knobWidth2;
oldKnob.right = oldKnobPos + knobWidth2;
newKnob.left = fKnobPos - knobWidth2;
newKnob.right = fKnobPos + knobWidth2;
Invalidate(oldKnob | newKnob);
}
#else
fKnobPos = _KnobPosFor(Bounds(), Value());
#endif
}
void
SeekSlider::Draw(BRect updateRect)
{
BRect r(Bounds());
float knobWidth2 = SEEK_SLIDER_KNOB_WIDTH / 2.0;
float sliderStart = (r.left + knobWidth2);
float sliderEnd = (r.right - knobWidth2);
float knobPos = sliderStart
+ floorf((sliderEnd - sliderStart - 1.0) * (Value() - fMinValue)
/ (fMaxValue - fMinValue) + 0.5);
BRect r(Bounds());
// draw both sides (the original from Be doesn't seem
// to make a difference for enabled/disabled state)
// DrawBitmapAsync(fLeftSideBits, r.LeftTop());
@@ -115,6 +133,10 @@ SeekSlider::Draw(BRect updateRect)
BPoint dotPos;
dotPos.y = r.top + 2.0;
SetHighColor(dotGreen);
float knobWidth2 = SEEK_SLIDER_KNOB_WIDTH / 2.0;
float sliderStart = (r.left + knobWidth2);
for (int32 i = 0; i < dotCount; i++) {
dotPos.x = sliderStart + i * 6.0 + 5.0;
StrokeLine(dotPos, BPoint(dotPos.x, dotPos.y + 6.0));
@@ -122,8 +144,8 @@ SeekSlider::Draw(BRect updateRect)
// slider handle
r.top -= 4.0;
r.bottom += 3.0;
r.left = knobPos - knobWidth2;
r.right = knobPos + knobWidth2;
r.left = fKnobPos - knobWidth2;
r.right = fKnobPos + knobWidth2;
// black outline
float handleBottomSize = 2.0;
float handleArrowSize = 6.0;
@@ -136,15 +158,15 @@ SeekSlider::Draw(BRect updateRect)
AddLine(BPoint(r.right, r.top + 1.0),
BPoint(r.right, r.top + handleBottomSize), black);
AddLine(BPoint(r.right - 1.0, r.top + handleBottomSize + 1.0),
BPoint(knobPos, r.top + handleArrowSize), black);
AddLine(BPoint(knobPos - 1.0, r.top + handleArrowSize - 1.0),
BPoint(fKnobPos, r.top + handleArrowSize), black);
AddLine(BPoint(fKnobPos - 1.0, r.top + handleArrowSize - 1.0),
BPoint(r.left + 1.0, r.top + handleBottomSize + 1.0), black);
// lower handle
AddLine(BPoint(r.left, r.bottom),
BPoint(r.left, r.bottom - handleBottomSize), black);
AddLine(BPoint(r.left + 1.0, r.bottom - handleBottomSize - 1.0),
BPoint(knobPos, r.bottom - handleArrowSize), black);
AddLine(BPoint(knobPos + 1.0, r.bottom - handleArrowSize + 1.0),
BPoint(fKnobPos, r.bottom - handleArrowSize), black);
AddLine(BPoint(fKnobPos + 1.0, r.bottom - handleArrowSize + 1.0),
BPoint(r.right, r.bottom - handleBottomSize), black);
AddLine(BPoint(r.right, r.bottom - handleBottomSize + 1.0),
BPoint(r.right, r.bottom), black);
@@ -164,15 +186,15 @@ SeekSlider::Draw(BRect updateRect)
AddLine(BPoint(r.right, r.top + 1.0),
BPoint(r.right, r.top + handleBottomSize), kSeekRedShadow);
AddLine(BPoint(r.right - 1.0, r.top + handleBottomSize + 1.0),
BPoint(knobPos, r.top + handleArrowSize), kSeekRedShadow);
AddLine(BPoint(knobPos - 1.0, r.top + handleArrowSize - 1.0),
BPoint(fKnobPos, r.top + handleArrowSize), kSeekRedShadow);
AddLine(BPoint(fKnobPos - 1.0, r.top + handleArrowSize - 1.0),
BPoint(r.left + 1.0, r.top + handleBottomSize + 1.0), kSeekRedLight);
// lower handle
AddLine(BPoint(r.left, r.bottom),
BPoint(r.left, r.bottom - handleBottomSize), kSeekRedLight);
AddLine(BPoint(r.left + 1.0, r.bottom - handleBottomSize - 1.0),
BPoint(knobPos, r.bottom - handleArrowSize), kSeekRedLight);
AddLine(BPoint(knobPos + 1.0, r.bottom - handleArrowSize + 1.0),
BPoint(fKnobPos, r.bottom - handleArrowSize), kSeekRedLight);
AddLine(BPoint(fKnobPos + 1.0, r.bottom - handleArrowSize + 1.0),
BPoint(r.right, r.bottom - handleBottomSize), kSeekRedShadow);
AddLine(BPoint(r.right, r.bottom - handleBottomSize + 1.0),
BPoint(r.right, r.bottom), kSeekRedShadow);
@@ -189,7 +211,7 @@ SeekSlider::Draw(BRect updateRect)
arrow[0].y = r.top;
arrow[1].x = r.right;
arrow[1].y = r.top;
arrow[2].x = knobPos;
arrow[2].x = fKnobPos;
arrow[2].y = r.top + handleArrowSize;
FillPolygon(arrow, 3);
// lower handle arrow
@@ -197,7 +219,7 @@ SeekSlider::Draw(BRect updateRect)
arrow[0].y = r.bottom;
arrow[1].x = r.right;
arrow[1].y = r.bottom;
arrow[2].x = knobPos;
arrow[2].x = fKnobPos;
arrow[2].y = r.bottom - handleArrowSize;
FillPolygon(arrow, 3);
} else {
@@ -274,8 +296,10 @@ void
SeekSlider::SetPosition(float position)
{
int32 value = fMinValue + (int32)floorf((fMaxValue - fMinValue) * position + 0.5);
if (value != Value())
if (value != Value()) {
BControl::SetValue(value);
}
}
@@ -299,6 +323,19 @@ SeekSlider::_ValueFor(float xPos) const
}
int32
SeekSlider::_KnobPosFor(BRect r, int32 value) const
{
float knobWidth2 = SEEK_SLIDER_KNOB_WIDTH / 2.0;
r.left += knobWidth2;
r.right -= knobWidth2;
float knobPos = r.left
+ floorf((r.right - r.left - 1.0) * (Value() - fMinValue)
/ (fMaxValue - fMinValue) + 0.5);
return (int32)knobPos;
}
void
SeekSlider::_StrokeFrame(BRect r, rgb_color left, rgb_color top,
rgb_color right, rgb_color bottom)
src/apps/mediaplayer/SeekSlider.h
+3
View File
@@ -37,6 +37,8 @@ class SeekSlider : public BControl {
private:
int32 _ValueFor(float x) const;
int32 _KnobPosFor(BRect bounds,
int32 value) const;
void _StrokeFrame(BRect frame,
rgb_color left,
rgb_color top,
@@ -44,6 +46,7 @@ private:
rgb_color bottom);
bool fTracking;
int32 fKnobPos;
int32 fMinValue;
int32 fMaxValue;
};