Revert "BScrollView: Increase small scroll step size from 1 to 3"

This reverts commit bdcfc07617.
This commit is contained in:
John Scipione 2014-03-08 15:18:35 -05:00
parent 1166849963
commit 5d98ee1e4d
2 changed files with 8 additions and 4 deletions

View File

@ -202,7 +202,7 @@ BScrollBar::BScrollBar(BRect frame, const char* name, BView* target,
B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE | B_FRAME_EVENTS),
fMin(min),
fMax(max),
fSmallStep(3.0f),
fSmallStep(1.0f),
fLargeStep(10.0f),
fValue(0),
fProportion(0.0f),
@ -232,7 +232,7 @@ BScrollBar::BScrollBar(const char* name, BView* target,
BView(name, B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE | B_FRAME_EVENTS),
fMin(min),
fMax(max),
fSmallStep(3.0f),
fSmallStep(1.0f),
fLargeStep(10.0f),
fValue(0),
fProportion(0.0f),
@ -269,7 +269,7 @@ BScrollBar::BScrollBar(BMessage* data)
fMax = 0.0f;
if (data->FindFloat("_steps", 0, &fSmallStep) < B_OK)
fSmallStep = 3.0f;
fSmallStep = 1.0f;
if (data->FindFloat("_steps", 1, &fLargeStep) < B_OK)
fLargeStep = 10.0f;

View File

@ -5733,7 +5733,11 @@ BView::ScrollWithMouseWheelDelta(BScrollBar* scrollBar, float delta)
// pressing the shift key scrolls faster (following the pseudo-standard set
// by other desktop environments).
delta *= (modifiers() & B_SHIFT_KEY) != 0 ? largeStep : smallStep;
if ((modifiers() & B_SHIFT_KEY) != 0)
delta *= largeStep;
else
delta *= smallStep * 3;
scrollBar->SetValue(scrollBar->Value() + delta);
return B_OK;