From 4f20bb9fb2731fdfd9faab3b109a0cbce8c89298 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 28 Apr 2014 10:39:06 -0700 Subject: When scrolling to dive, scroll to trip first The behavior at startup is actually very annoying: we select the latest dive, and expand the trip it is in, but since we use "scrollTo()" on just the dive, and it's not initially visible, the startup will make the first dive be at the top of the list view. Which means that the actual _trip_ detail is not visible at all, since it will have been scrolled off the list view entirely. Fix this by first scrolling to the trip, and only then scrolling to the actual dive (using the default "EnsureVisible" policy). Obviously, if it's a trip with lots of dives, scrolling to the dive may end up scrolling away from the trip header again, but at least that never happens at startup, and at that point you have to scroll away from the trip just to show the dive. Do this same dance when changing the dive selection (mainly noticeable when picking dives on the globe view). Signed-off-by: Linus Torvalds Signed-off-by: Dirk Hohndel --- qt-ui/divelistview.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'qt-ui') diff --git a/qt-ui/divelistview.cpp b/qt-ui/divelistview.cpp index 28ed09f2c..d8e66d0c6 100644 --- a/qt-ui/divelistview.cpp +++ b/qt-ui/divelistview.cpp @@ -218,6 +218,8 @@ void DiveListView::selectDive(int i, bool scrollto, bool toggle) if (idx.parent().isValid()) { setAnimated(false); expand(idx.parent()); + if (scrollto) + scrollTo(idx.parent()); setAnimated(true); } if (scrollto) @@ -274,6 +276,8 @@ void DiveListView::selectDives(const QList &newDiveSelection) this, SLOT(currentChanged(QModelIndex, QModelIndex))); Q_EMIT currentDiveChanged(selected_dive); const QModelIndex &idx = m->match(m->index(0, 0), DiveTripModel::DIVE_IDX, selected_dive, 2, Qt::MatchRecursive).first(); + if (idx.parent().isValid()) + scrollTo(idx.parent()); scrollTo(idx); } @@ -371,6 +375,7 @@ void DiveListView::reload(DiveTripModel::Layout layout, bool forceSort) if (!isExpanded(curr)) { setAnimated(false); expand(curr); + scrollTo(curr); setAnimated(true); } } -- cgit v1.2.3-70-g09d2