Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More fixes towards better drawing

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12269 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini 2005-04-07 15:24:29 +00:00
parent 81d71c74c8
commit 347f3fa357
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/kits/interface/ChannelSlider.cpp
View File

@ -432,8 +432,8 @@ BChannelSlider::DrawChannel(BView *into, int32 channel, BRect area, bool pressed
BPoint leftTop; BPoint leftTop;
BPoint bottomRight; BPoint bottomRight;
if (Vertical()) { if (Vertical()) {
leftTop.Set(area.left + hCenter, area.top); leftTop.Set(area.left + hCenter, area.top + vCenter);
bottomRight.Set(leftTop.x , area.top + ThumbRangeFor(channel)); bottomRight.Set(leftTop.x , leftTop.y + ThumbRangeFor(channel));
} else { } else {
leftTop.Set(area.left, area.top + vCenter); leftTop.Set(area.left, area.top + vCenter);
bottomRight.Set(area.left + ThumbRangeFor(channel), leftTop.y); bottomRight.Set(area.left + ThumbRangeFor(channel), leftTop.y);
@ -631,7 +631,7 @@ void
BChannelSlider::DrawThumbs() BChannelSlider::DrawThumbs()
{ {
BRect first = ThumbFrameFor(0); BRect first = ThumbFrameFor(0);
BRect last = ThumbFrameFor(CountChannels()); BRect last = ThumbFrameFor(CountChannels() - 1);
if (fBacking == NULL) { if (fBacking == NULL) {
BRect bitmapFrame; BRect bitmapFrame;
@ -647,6 +647,7 @@ BChannelSlider::DrawThumbs()
bitmapFrame.right = last.right + ThumbRangeFor(0); bitmapFrame.right = last.right + ThumbRangeFor(0);
} }
bitmapFrame.InsetBy(-3, -3);
bitmapFrame.OffsetTo(B_ORIGIN); bitmapFrame.OffsetTo(B_ORIGIN);
fBacking = new BBitmap(bitmapFrame, BScreen(Window()).ColorSpace(), true, false); fBacking = new BBitmap(bitmapFrame, BScreen(Window()).ColorSpace(), true, false);
@ -659,26 +660,31 @@ BChannelSlider::DrawThumbs()
} }
} }
if (fBacking->Lock()) { BPoint drawHere;
fBackingView->FillRect(fBackingView->Bounds(), B_SOLID_LOW); drawHere.x = (Bounds().Width() - fBacking->Bounds().Width()) / 2;
for (int32 i = 0; i < CountChannels(); i++) drawHere.y = (Bounds().Height() - fBacking->Bounds().Height()) / 2 ;
DrawChannel(fBackingView, i, ThumbFrameFor(i), fMinpoint != 0);
if (fBacking->Lock()) {
// Clear the view's background
fBackingView->FillRect(fBackingView->Bounds(), B_SOLID_LOW);
for (int32 channel = 0; channel < CountChannels(); channel++) {
BRect channelArea = ThumbFrameFor(channel);
// TODO: HACK!!! What am I missing ?
// Why do I need this to draw the channel in the correct location ?
channelArea.OffsetBy(3, -21);
DrawChannel(fBackingView, channel, channelArea, fMinpoint != 0);
}
fBackingView->Sync(); fBackingView->Sync();
fBacking->Unlock(); fBacking->Unlock();
} }
BPoint drawHere;
drawHere.x = (Bounds().Width() - fBacking->Bounds().Width()) / 2;
drawHere.y = (Bounds().Height() - fBacking->Bounds().Height()) / 2;
fClickDelta = drawHere; fClickDelta = drawHere;
// TODO: Look at the above comment
fClickDelta.y -= 21;
fClickDelta.x += 3;
DrawBitmapAsync(fBacking, drawHere); DrawBitmapAsync(fBacking, drawHere);
#if 1
SetHighColor(125, 125, 125, 0);
StrokeRect(fBacking->Bounds().OffsetToCopy(drawHere));
#endif
} }