mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make the selection logic more robust

Browse source 
In commit 304526850c91 ("Don't deselect all dives on all selection
"change" events") the handling of "selected_dive" is incorrect. We ended
up with non-sensical values for the selected dive, including dives that
Gtk didn't think were selected.

This commit tries to be smart about what to do when the dive that we
currently consider selected is unselected (we have this weird notion of
many dives being selected, but one of them is shown in the profile and
that is the "selected_dive"). As long as there are others selected, we
pick one of them (first walking to earlier dives and if there are none
that are selected, looking for a later dive) as the new selected dive.

This appears to give us a rather intuitive behavior when playing with
multiple selected dives.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-01-30 07:05:30 +11:00
parent 4b5b732f2c
commit 468d3f28f9
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
divelist.c
View file

@ -2611,8 +2611,22 @@ static void deselect_dive(int idx)
if (dive && dive->selected) { if (dive && dive->selected) {
dive->selected = 0; dive->selected = 0;
amount_selected--; amount_selected--;
if (selected_dive > idx) if (selected_dive == idx && amount_selected > 0) {
selected_dive--; /* pick a different dive as selected */
while(--selected_dive >= 0) {
dive = get_dive(selected_dive);
if (dive && dive->selected)
return;
}
selected_dive = idx;
while(++selected_dive < dive_table.nr) {
dive = get_dive(selected_dive);
if (dive && dive->selected)
return;
}
}
if (amount_selected == 0)
selected_dive = -1;
} }
} }