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

Minor cleanup.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20045 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2007-02-02 12:44:51 +00:00
parent a83c8bbffa
commit f55ffadf96
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/ScrollBar.cpp
+13 -14
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2001-2006, Haiku, Inc. * Copyright (c) 2001-2007, Haiku, Inc.
* Distributed under the terms of the MIT license. * Distributed under the terms of the MIT license.
* *
* Authors: * Authors:
@@ -493,7 +493,7 @@ BScrollBar::MessageReceived(BMessage *msg)
} }
} }
// MouseDown
void void
BScrollBar::MouseDown(BPoint where) BScrollBar::MouseDown(BPoint where)
{ {
@@ -502,20 +502,11 @@ BScrollBar::MouseDown(BPoint where)
SetMouseEventMask(B_POINTER_EVENTS, B_LOCK_WINDOW_FOCUS); SetMouseEventMask(B_POINTER_EVENTS, B_LOCK_WINDOW_FOCUS);
int32 buttons = B_PRIMARY_MOUSE_BUTTON; int32 buttons;
if (Looper() != NULL && Looper()->CurrentMessage() != NULL if (Looper() == NULL || Looper()->CurrentMessage() == NULL
&& Looper()->CurrentMessage()->FindInt32("buttons", &buttons) != B_OK) || Looper()->CurrentMessage()->FindInt32("buttons", &buttons) != B_OK)
buttons = B_PRIMARY_MOUSE_BUTTON; buttons = B_PRIMARY_MOUSE_BUTTON;
// hit test for the thumb
if (fPrivateData->fThumbFrame.Contains(where)
&& (buttons & B_SECONDARY_MOUSE_BUTTON) == 0) {
fPrivateData->fButtonDown = THUMB;
fPrivateData->fClickOffset = fPrivateData->fThumbFrame.LeftTop() - where;
Invalidate(fPrivateData->fThumbFrame);
return;
}
if (buttons & B_SECONDARY_MOUSE_BUTTON) { if (buttons & B_SECONDARY_MOUSE_BUTTON) {
// special absolute scrolling: move thumb to where we clicked // special absolute scrolling: move thumb to where we clicked
fPrivateData->fButtonDown = THUMB; fPrivateData->fButtonDown = THUMB;
@@ -529,6 +520,14 @@ BScrollBar::MouseDown(BPoint where)
return; return;
} }
// hit test for the thumb
if (fPrivateData->fThumbFrame.Contains(where)) {
fPrivateData->fButtonDown = THUMB;
fPrivateData->fClickOffset = fPrivateData->fThumbFrame.LeftTop() - where;
Invalidate(fPrivateData->fThumbFrame);
return;
}
// hit test for arrows or empty area // hit test for arrows or empty area
float scrollValue = 0.0; float scrollValue = 0.0;
fPrivateData->fButtonDown = _ButtonFor(where); fPrivateData->fButtonDown = _ButtonFor(where);