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

the thumb is more visible when the ScrollBar has the disabled look... my girlfriend suggested that so you all just have to accept it

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16513 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2006-02-26 17:48:34 +00:00
parent 10443b3306
commit 3afffe04bb
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/kits/interface/ScrollBar.cpp
View File

@ -836,26 +836,30 @@ BScrollBar::Draw(BRect updateRect)
_DrawDisabledBackground(thumbBG, light, dark, dark1); _DrawDisabledBackground(thumbBG, light, dark, dark1);
} else { } else {
// we could scroll, but we're simply disabled // we could scroll, but we're simply disabled
float bgTint = 1.06;
rgb_color bgLight = tint_color(light, bgTint * 3);
rgb_color bgShadow = tint_color(dark, bgTint);
rgb_color bgFill = tint_color(dark1, bgTint);
if (fOrientation == B_HORIZONTAL) { if (fOrientation == B_HORIZONTAL) {
// left of thumb // left of thumb
BRect besidesThumb(thumbBG); BRect besidesThumb(thumbBG);
besidesThumb.right = rect.left - 1; besidesThumb.right = rect.left - 1;
_DrawDisabledBackground(besidesThumb, light, dark, dark1); _DrawDisabledBackground(besidesThumb, bgLight, bgShadow, bgFill);
// right of thumb // right of thumb
besidesThumb.left = rect.right + 1; besidesThumb.left = rect.right + 1;
besidesThumb.right = thumbBG.right; besidesThumb.right = thumbBG.right;
_DrawDisabledBackground(besidesThumb, light, dark, dark1); _DrawDisabledBackground(besidesThumb, bgLight, bgShadow, bgFill);
} else { } else {
// above thumb // above thumb
BRect besidesThumb(thumbBG); BRect besidesThumb(thumbBG);
besidesThumb.bottom = rect.top - 1; besidesThumb.bottom = rect.top - 1;
_DrawDisabledBackground(besidesThumb, light, dark, dark1); _DrawDisabledBackground(besidesThumb, bgLight, bgShadow, bgFill);
// below thumb // below thumb
besidesThumb.top = rect.bottom + 1; besidesThumb.top = rect.bottom + 1;
besidesThumb.bottom = thumbBG.bottom; besidesThumb.bottom = thumbBG.bottom;
_DrawDisabledBackground(besidesThumb, light, dark, dark1); _DrawDisabledBackground(besidesThumb, bgLight, bgShadow, bgFill);
} }
// thumb // thumb bevel
BeginLineArray(4); BeginLineArray(4);
AddLine(BPoint(rect.left, rect.bottom), AddLine(BPoint(rect.left, rect.bottom),
BPoint(rect.left, rect.top), light); BPoint(rect.left, rect.top), light);
@ -866,7 +870,7 @@ BScrollBar::Draw(BRect updateRect)
AddLine(BPoint(rect.right - 1, rect.bottom), AddLine(BPoint(rect.right - 1, rect.bottom),
BPoint(rect.left + 1, rect.bottom), dark2); BPoint(rect.left + 1, rect.bottom), dark2);
EndLineArray(); EndLineArray();
// fill thumb // thumb fill
rect.InsetBy(1.0, 1.0); rect.InsetBy(1.0, 1.0);
SetHighColor(dark1); SetHighColor(dark1);
FillRect(rect); FillRect(rect);
@ -1279,7 +1283,8 @@ control_scrollbar(scroll_bar_info *info, BScrollBar *bar)
// _DrawDisabledBackground // _DrawDisabledBackground
void void
BScrollBar::_DrawDisabledBackground(BRect area, BScrollBar::_DrawDisabledBackground(BRect area,
const rgb_color& light, const rgb_color& dark, const rgb_color& light,
const rgb_color& dark,
const rgb_color& fill) const rgb_color& fill)
{ {
if (!area.IsValid()) if (!area.IsValid())