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

No uses B_OP_OVER when drawing the arrows - this fixes the broken look

Browse Source 
due to anti-aliasing. Have I mentioned that the arrows are very ugly
anyway right now, and don't match the rest of the look? :-)
Fixed a crashing bug in the "pressed button repeater" - it didn't lock
the looper when scrolling the view.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13191 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-06-16 21:30:34 +00:00
parent 5fcce1f54b
commit dec3c805d9
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/ScrollBar.cpp
+19 -13
View File
@@ -1,5 +1,5 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Copyright (c) 2001-2002 OpenBeOS // Copyright (c) 2001-2005 Haiku
// //
// Permission is hereby granted, free of charge, to any person obtaining a // Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the "Software"), // copy of this software and associated documentation files (the "Software"),
@@ -128,16 +128,16 @@ BScrollBar::Private::ButtonRepeaterThread(void *data)
BScrollBar *scrollBar = static_cast<BScrollBar *>(data); BScrollBar *scrollBar = static_cast<BScrollBar *>(data);
BRect oldframe(scrollBar->fPrivateData->fThumbFrame); BRect oldframe(scrollBar->fPrivateData->fThumbFrame);
// BRect update(sb->fPrivateData->fThumbFrame); // BRect update(sb->fPrivateData->fThumbFrame);
snooze(250000); snooze(250000);
bool exitval = false; bool exitval = false;
status_t returnval; status_t returnval;
scrollBar->Window()->Lock(); scrollBar->Window()->Lock();
exitval = scrollBar->fPrivateData->fExitRepeater; exitval = scrollBar->fPrivateData->fExitRepeater;
scrollBar->Window()->Unlock(); scrollBar->Window()->Unlock();
float scrollvalue = 0; float scrollvalue = 0;
if (scrollBar->fPrivateData->fArrowDown == ARROW_LEFT if (scrollBar->fPrivateData->fArrowDown == ARROW_LEFT
@@ -150,19 +150,21 @@ BScrollBar::Private::ButtonRepeaterThread(void *data)
while (!exitval) { while (!exitval) {
oldframe = scrollBar->fPrivateData->fThumbFrame; oldframe = scrollBar->fPrivateData->fThumbFrame;
scrollBar->Window()->Lock();
returnval = scroll_by_value(scrollvalue, scrollBar); returnval = scroll_by_value(scrollvalue, scrollBar);
scrollBar->Window()->Unlock();
snooze(50000); snooze(50000);
scrollBar->Window()->Lock(); scrollBar->Window()->Lock();
exitval=scrollBar->fPrivateData->fExitRepeater; exitval = scrollBar->fPrivateData->fExitRepeater;
if (returnval == B_OK) { if (returnval == B_OK) {
scrollBar->CopyBits(oldframe,scrollBar->fPrivateData->fThumbFrame); scrollBar->CopyBits(oldframe, scrollBar->fPrivateData->fThumbFrame);
// TODO: Redraw the old area here // TODO: Redraw the old area here
scrollBar->ValueChanged(scrollBar->fValue); scrollBar->ValueChanged(scrollBar->fValue);
} }
scrollBar->Window()->Unlock(); scrollBar->Window()->Unlock();
@@ -804,7 +806,9 @@ BScrollBar::Draw(BRect updateRect)
SetHighColor(dark); SetHighColor(dark);
StrokeRect(Bounds()); StrokeRect(Bounds());
SetDrawingMode(B_OP_OVER);
// Draw arrows // Draw arrows
BPoint buttonpt(0,0); BPoint buttonpt(0,0);
if (fOrientation == B_HORIZONTAL) { if (fOrientation == B_HORIZONTAL) {
@@ -844,7 +848,9 @@ BScrollBar::Draw(BRect updateRect)
fPrivateData->DrawScrollBarButton(this, ARROW_DOWN, buttonpt, fPrivateData->DrawScrollBarButton(this, ARROW_DOWN, buttonpt,
fPrivateData->fButtonDown == ARROW4); fPrivateData->fButtonDown == ARROW4);
} }
SetDrawingMode(B_OP_COPY);
// Draw scroll thumb // Draw scroll thumb
if (fPrivateData->fEnabled) { if (fPrivateData->fEnabled) {
@@ -1053,7 +1059,7 @@ control_scrollbar(scroll_bar_info *info, BScrollBar *bar)
if (bar->fPrivateData->fScrollBarInfo.double_arrows != info->double_arrows) { if (bar->fPrivateData->fScrollBarInfo.double_arrows != info->double_arrows) {
bar->fPrivateData->fScrollBarInfo.double_arrows = info->double_arrows; bar->fPrivateData->fScrollBarInfo.double_arrows = info->double_arrows;
int8 multiplier=(info->double_arrows) ? 1 : -1; int8 multiplier = (info->double_arrows) ? 1 : -1;
if (bar->fOrientation == B_VERTICAL) if (bar->fOrientation == B_VERTICAL)
bar->fPrivateData->fThumbFrame.OffsetBy(0, multiplier * B_H_SCROLL_BAR_HEIGHT); bar->fPrivateData->fThumbFrame.OffsetBy(0, multiplier * B_H_SCROLL_BAR_HEIGHT);