Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-17 12:47:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor tweak to drag behaviour of scrollviews

Browse Source
This commit is contained in:
Henrik Rydgård 2014-03-10 23:13:26 +01:00
parent 5152308c79
commit d2029ed29a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/viewgroup.cpp
View File

@ -658,15 +658,16 @@ void ScrollView::Touch(const TouchInput &input) {
}
if (input.flags & TOUCH_UP) {
float info[4];
if (!IsDragCaptured(input.id) && gesture_.GetGestureInfo(GESTURE_DRAG_VERTICAL, info))
if (!IsDragCaptured(input.id) && gesture_.GetGestureInfo(GESTURE_DRAG_VERTICAL, info)) {
inertia_ = info[1];
}
}
TouchInput input2;
if (CanScroll() && !IsDragCaptured(input.id)) {
input2 = gesture_.Update(input, bounds_);
float info[4];
if (gesture_.GetGestureInfo(GESTURE_DRAG_VERTICAL, info)) {
if (gesture_.GetGestureInfo(GESTURE_DRAG_VERTICAL, info) && !(input.flags & TOUCH_DOWN)) {
float pos = scrollStart_ - info[0];
ClampScrollPos(pos);
scrollPos_ = pos;
@ -675,6 +676,8 @@ void ScrollView::Touch(const TouchInput &input) {
}
} else {
input2 = input;
scrollTarget_ = scrollPos_;
scrollToTarget_ = false;
}
if (!(input.flags & TOUCH_DOWN) || bounds_.Contains(input.x, input.y)) {
@ -753,7 +756,7 @@ void ScrollView::ClampScrollPos(float &pos) {
pos = 0.0f;
return;
}
// Clamp scrollTarget.
float childHeight = views_[0]->GetBounds().h;
float scrollMax = std::max(0.0f, childHeight - bounds_.h);