Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-15 11:48:33 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

UI: Clamp scroll pos on render.

Browse Source 
This way we don't clamp wrongly when views don't have sizes yet, and we
also do clamp when we need to.

We can allow a little flex by tracking the down state too.
This commit is contained in:
Unknown W. Brackets 2016-01-23 10:10:43 -08:00
parent 705ab497f2
commit c1812ae7d7
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ext/native/ui/viewgroup.cpp
View File

@ -746,7 +746,6 @@ void ScrollView::Touch(const TouchInput &input) {
float info[4];
if (gesture_.GetGestureInfo(gesture, info) && !(input.flags & TOUCH_DOWN)) {
float pos = scrollStart_ - info[0];
ClampScrollPos(pos);
scrollPos_ = pos;
scrollTarget_ = pos;
scrollToTarget_ = false;
@ -842,7 +841,6 @@ void ScrollView::PersistData(PersistStatus status, std::string anonId, PersistMa
case PERSIST_RESTORE:
if (buffer.size() == 1) {
float pos = *(float *)&buffer[0];
ClampScrollPos(pos);
scrollPos_ = pos;
scrollTarget_ = pos;
scrollToTarget_ = false;
@ -864,13 +862,11 @@ void ScrollView::SetVisibility(Visibility visibility) {
void ScrollView::ScrollTo(float newScrollPos) {
scrollTarget_ = newScrollPos;
scrollToTarget_ = true;
ClampScrollPos(scrollTarget_);
}
void ScrollView::ScrollRelative(float distance) {
scrollTarget_ = scrollPos_ + distance;
scrollToTarget_ = true;
ClampScrollPos(scrollTarget_);
}
void ScrollView::ClampScrollPos(float &pos) {
@ -917,6 +913,8 @@ void ScrollView::Update(const InputState &input_state) {
ViewGroup::Update(input_state);
gesture_.UpdateFrame();
if (scrollToTarget_) {
ClampScrollPos(scrollTarget_);
inertia_ = 0.0f;
if (fabsf(scrollTarget_ - scrollPos_) < 0.5f) {
scrollPos_ = scrollTarget_;
@ -929,8 +927,9 @@ void ScrollView::Update(const InputState &input_state) {
inertia_ *= friction;
if (fabsf(inertia_) < stop_threshold)
inertia_ = 0.0f;
ClampScrollPos(scrollPos_);
}
ClampScrollPos(scrollPos_);
}
void AnchorLayout::Measure(const UIContext &dc, MeasureSpec horiz, MeasureSpec vert) {