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

Draw() -> Invalidate(). small color fix.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@13403 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2005-07-02 14:30:49 +00:00
parent 0ee76eaf12
commit 7505732a0c
1 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/ScrollBar.cpp
+17 -19
View File
@@ -499,14 +499,12 @@ void
BScrollBar::MouseDown(BPoint pt) BScrollBar::MouseDown(BPoint pt)
{ {
if (!(fMin == 0 && fMax == 0)) { // if fEnabled if (!(fMin == 0 && fMax == 0)) { // if fEnabled
// Hit test for thumb // Hit test for thumb
if (fPrivateData->fThumbFrame.Contains(pt)) { if (fPrivateData->fThumbFrame.Contains(pt)) {
fPrivateData->fTracking = true; fPrivateData->fTracking = true;
fPrivateData->fMousePos = pt; fPrivateData->fMousePos = pt;
// TODO: empty event mask ? Is this okay ? SetMouseEventMask(B_POINTER_EVENTS, B_LOCK_WINDOW_FOCUS);
SetMouseEventMask(0, B_LOCK_WINDOW_FOCUS); Invalidate(fPrivateData->fThumbFrame);
Draw(fPrivateData->fThumbFrame);
return; return;
} }
@@ -523,7 +521,7 @@ BScrollBar::MouseDown(BPoint pt)
returnval = ScrollByValue(scrollval); returnval = ScrollByValue(scrollval);
if (returnval == B_OK) { if (returnval == B_OK) {
Draw(buttonrect); Invalidate(buttonrect);
ValueChanged(fValue); ValueChanged(fValue);
if (fPrivateData->fRepeaterThread == -1) { if (fPrivateData->fRepeaterThread == -1) {
@@ -546,7 +544,7 @@ BScrollBar::MouseDown(BPoint pt)
returnval = ScrollByValue(scrollval); returnval = ScrollByValue(scrollval);
if (returnval == B_OK) { if (returnval == B_OK) {
Draw(buttonrect); Invalidate(buttonrect);
ValueChanged(fValue); ValueChanged(fValue);
if (fPrivateData->fRepeaterThread == -1) { if (fPrivateData->fRepeaterThread == -1) {
@@ -568,7 +566,7 @@ BScrollBar::MouseDown(BPoint pt)
returnval = ScrollByValue(scrollval); returnval = ScrollByValue(scrollval);
if (returnval == B_OK) { if (returnval == B_OK) {
Draw(buttonrect); Invalidate(buttonrect);
ValueChanged(fValue); ValueChanged(fValue);
if (fPrivateData->fRepeaterThread == -1) { if (fPrivateData->fRepeaterThread == -1) {
@@ -589,7 +587,7 @@ BScrollBar::MouseDown(BPoint pt)
returnval = ScrollByValue(scrollval); returnval = ScrollByValue(scrollval);
if (returnval == B_OK) { if (returnval == B_OK) {
Draw(buttonrect); Invalidate(buttonrect);
ValueChanged(fValue); ValueChanged(fValue);
if (fPrivateData->fRepeaterThread == -1) { if (fPrivateData->fRepeaterThread == -1) {
@@ -618,7 +616,7 @@ BScrollBar::MouseDown(BPoint pt)
returnval = ScrollByValue(scrollval); returnval = ScrollByValue(scrollval);
if (returnval == B_OK) { if (returnval == B_OK) {
Draw(buttonrect); Invalidate(buttonrect);
ValueChanged(fValue); ValueChanged(fValue);
if(fPrivateData->fRepeaterThread == -1) { if(fPrivateData->fRepeaterThread == -1) {
@@ -639,7 +637,7 @@ BScrollBar::MouseDown(BPoint pt)
returnval = ScrollByValue(scrollval); returnval = ScrollByValue(scrollval);
if (returnval == B_OK) { if (returnval == B_OK) {
Draw(buttonrect); Invalidate(buttonrect);
ValueChanged(fValue); ValueChanged(fValue);
if(fPrivateData->fRepeaterThread == -1) { if(fPrivateData->fRepeaterThread == -1) {
@@ -661,7 +659,7 @@ BScrollBar::MouseDown(BPoint pt)
returnval = ScrollByValue(scrollval); returnval = ScrollByValue(scrollval);
if (returnval == B_OK) { if (returnval == B_OK) {
Draw(buttonrect); Invalidate(buttonrect);
ValueChanged(fValue); ValueChanged(fValue);
if (fPrivateData->fRepeaterThread == -1) { if (fPrivateData->fRepeaterThread == -1) {
@@ -682,7 +680,7 @@ BScrollBar::MouseDown(BPoint pt)
returnval = ScrollByValue(scrollval); returnval = ScrollByValue(scrollval);
if (returnval == B_OK) { if (returnval == B_OK) {
Draw(buttonrect); Invalidate(buttonrect);
ValueChanged(fValue); ValueChanged(fValue);
if(fPrivateData->fRepeaterThread == -1) { if(fPrivateData->fRepeaterThread == -1) {
@@ -709,7 +707,7 @@ BScrollBar::MouseDown(BPoint pt)
} }
ValueChanged(fValue); ValueChanged(fValue);
Draw(Bounds()); Invalidate(Bounds());
} }
} }
@@ -728,20 +726,20 @@ BScrollBar::MouseUp(BPoint pt)
if (fOrientation == B_VERTICAL) { if (fOrientation == B_VERTICAL) {
rect.bottom += B_H_SCROLL_BAR_HEIGHT + 1; rect.bottom += B_H_SCROLL_BAR_HEIGHT + 1;
Draw(rect); Invalidate(rect);
rect.OffsetTo(0, Bounds().Height() - ((B_H_SCROLL_BAR_HEIGHT * 2) + 1)); rect.OffsetTo(0, Bounds().Height() - ((B_H_SCROLL_BAR_HEIGHT * 2) + 1));
Draw(rect); Invalidate(rect);
} else { } else {
rect.bottom += B_V_SCROLL_BAR_WIDTH + 1; rect.bottom += B_V_SCROLL_BAR_WIDTH + 1;
Draw(rect); Invalidate(rect);
rect.OffsetTo(0, Bounds().Height() - ((B_V_SCROLL_BAR_WIDTH * 2) + 1)); rect.OffsetTo(0, Bounds().Height() - ((B_V_SCROLL_BAR_WIDTH * 2) + 1));
Draw(rect); Invalidate(rect);
} }
if (fPrivateData->fTracking) { if (fPrivateData->fTracking) {
fPrivateData->fTracking = false; fPrivateData->fTracking = false;
SetMouseEventMask(0, 0); SetMouseEventMask(0, 0);
Draw(fPrivateData->fThumbFrame); Invalidate(fPrivateData->fThumbFrame);
} }
} }
@@ -957,7 +955,7 @@ void
BScrollBar::DrawArrow(BPoint pos, int32 which, bool pressed) BScrollBar::DrawArrow(BPoint pos, int32 which, bool pressed)
{ {
rgb_color no_tint = ui_color(B_PANEL_BACKGROUND_COLOR), rgb_color no_tint = ui_color(B_PANEL_BACKGROUND_COLOR),
lighten2 = tint_color(no_tint, B_LIGHTEN_2_TINT), lighten2 = { 255, 255, 255, 255 },
darken1 = tint_color(no_tint, B_DARKEN_1_TINT), darken1 = tint_color(no_tint, B_DARKEN_1_TINT),
darken2 = tint_color(no_tint, B_DARKEN_2_TINT); darken2 = tint_color(no_tint, B_DARKEN_2_TINT);