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

added scrolling with the right mouse button

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12728 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2005-05-18 23:42:58 +00:00
parent 62f9753de5
commit 1fd87770e9
3 changed files with 44 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tests/servers/app/playground/Jamfile
View File

@ -17,7 +17,7 @@ if ( $(TARGET_PLATFORM) = haiku ) {
} else {
# for running in the Haiku app_server under R5:
LinkSharedOSLibs Playground :
<boot!home!config!lib>libopenbeos.so ;
# be ;
# <boot!home!config!lib>libopenbeos.so ;
be ;
}

58
src/tests/servers/app/playground/ObjectView.cpp
View File

@ -18,7 +18,9 @@ ObjectView::ObjectView(BRect frame, const char* name,
fStateList(20),
fColor((rgb_color){ 0, 80, 255, 100 }),
fFill(false),
fPenSize(10.0)
fPenSize(10.0),
fScrolling(false),
fLastMousePos(0.0, 0.0)
{
rgb_color bg = tint_color(ui_color(B_PANEL_BACKGROUND_COLOR), B_LIGHTEN_1_TINT);
SetViewColor(bg);
@ -41,7 +43,7 @@ ObjectView::Draw(BRect updateRect)
BRect r(Bounds());
BeginLineArray(4);
/* BeginLineArray(4);
AddLine(BPoint(r.left, r.top),
BPoint(r.right, r.top), shadow);
AddLine(BPoint(r.right, r.top + 1),
@ -50,7 +52,7 @@ ObjectView::Draw(BRect updateRect)
BPoint(r.left, r.bottom), light);
AddLine(BPoint(r.left, r.bottom - 1),
BPoint(r.left, r.top + 1), shadow);
EndLineArray();
EndLineArray();*/
SetHighColor(255, 0, 0, 128);
@ -82,13 +84,21 @@ SetDrawingMode(B_OP_COPY);
void
ObjectView::MouseDown(BPoint where)
{
if (!fState)
SetState(State::StateFor(fObjectType, fColor, fFill, fPenSize));
uint32 buttons;
Window()->CurrentMessage()->FindInt32("buttons", (int32*)&buttons);
fScrolling = buttons & B_SECONDARY_MOUSE_BUTTON;
if (fState) {
Invalidate(fState->Bounds());
fState->MouseDown(where);
Invalidate(fState->Bounds());
if (fScrolling) {
fLastMousePos = where;
} else {
if (!fState)
SetState(State::StateFor(fObjectType, fColor, fFill, fPenSize));
if (fState) {
Invalidate(fState->Bounds());
fState->MouseDown(where);
Invalidate(fState->Bounds());
}
}
}
@ -96,8 +106,12 @@ ObjectView::MouseDown(BPoint where)
void
ObjectView::MouseUp(BPoint where)
{
if (fState) {
fState->MouseUp(where);
if (fScrolling) {
fScrolling = false;
} else {
if (fState) {
fState->MouseUp(where);
}
}
}
@ -106,14 +120,20 @@ void
ObjectView::MouseMoved(BPoint where, uint32 transit,
const BMessage* dragMessage)
{
if (fState && fState->IsTracking()) {
BRect before = fState->Bounds();
fState->MouseMoved(where);
BRect after = fState->Bounds();
BRect invalid(before | after);
Invalidate(invalid);
if (fScrolling) {
BPoint offset = fLastMousePos - where;
ScrollBy(offset.x, offset.y);
fLastMousePos = where + offset;
} else {
if (fState && fState->IsTracking()) {
BRect before = fState->Bounds();
fState->MouseMoved(where);
BRect after = fState->Bounds();
BRect invalid(before | after);
Invalidate(invalid);
}
}
}

3
src/tests/servers/app/playground/ObjectView.h
View File

@ -59,6 +59,9 @@ class ObjectView : public BView {
rgb_color fColor;
bool fFill;
float fPenSize;
bool fScrolling;
BPoint fLastMousePos;
};
#endif // OBJECT_VIEW_H