mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix broken multi selected dive to trip

Browse source 
See referenced issue number. It leads back to an ancient (3 year old)
commit 512c42e. Not sure this issue is introduced there, but that's not
relevant.

Key in reproducing this is the location where the context menu is
requested (using the right mouse button). When it is the row next
to the trip, the add-to-trip succeeds correctly, otherwise
it is a no-op.

The solution is rather trivial (in hindsight). Just loop over the
selected dives, and try to find the trip we want to add to.

Fixes: #522

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
This commit is contained in:
Jan Mulder 2017-10-22 14:43:55 +02:00 • committed by Dirk Hohndel
parent 5d12143a6a
commit 87db35de3c
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
desktop-widgets/divelistview.cpp
View file

@ -718,11 +718,20 @@ void DiveListView::addToTripAbove()
void DiveListView::addToTrip(int delta)
{
// if there is a trip above / below, then it's a sibling at the same
// level as this dive. So let's take a look
// d points to the row that has (mouse-)pointer focus, and there are nr rows selected
struct dive *d = (struct dive *)contextMenuIndex.data(DiveTripModel::DIVE_ROLE).value<void *>();
QModelIndex t = contextMenuIndex.sibling(contextMenuIndex.row() + delta, 0);
dive_trip_t *trip = (dive_trip_t *)t.data(DiveTripModel::TRIP_ROLE).value<void *>();
int nr = selectionModel()->selectedRows().count();
QModelIndex t;
dive_trip_t *trip = NULL;
// now look for the trip to add to, for this, loop over the selected dives and
// check if its sibling is a trip.
for (int i = 1; i <= nr; i++) {
t = contextMenuIndex.sibling(contextMenuIndex.row() + (delta > 0 ? i: i * -1), 0);
trip = (dive_trip_t *)t.data(DiveTripModel::TRIP_ROLE).value<void *>();
if (trip)
break;
}
if (!trip || !d)
// no dive, no trip? get me out of here