From e1abf9485cf59f1b8cb79d827fa386af48f095a4 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sun, 23 Jun 2019 11:13:41 +0200 Subject: Undo: unify selection behavior in dive-list commands Some commands tried to retain the current selection on undo/redo, others set the selection to the modified dives. The latter was introduced because it was easier in some cases, but it is probably more user-friendly because the user gets feedback on the change. Therefore, unify to always select the affected dives on undo()/redo(). Signed-off-by: Berthold Stoeger --- desktop-widgets/divelistview.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'desktop-widgets/divelistview.cpp') diff --git a/desktop-widgets/divelistview.cpp b/desktop-widgets/divelistview.cpp index 055737252..c010c0010 100644 --- a/desktop-widgets/divelistview.cpp +++ b/desktop-widgets/divelistview.cpp @@ -192,13 +192,11 @@ void DiveListView::reset() } // If items were selected, inform the selection model -void DiveListView::diveSelectionChanged(const QVector &indexes, bool select) +void DiveListView::diveSelectionChanged(const QVector &indexes) { + clearSelection(); MultiFilterSortModel *m = MultiFilterSortModel::instance(); QItemSelectionModel *s = selectionModel(); - auto flags = select ? - QItemSelectionModel::Rows | QItemSelectionModel::Select : - QItemSelectionModel::Rows | QItemSelectionModel::Deselect; for (const QModelIndex &index: indexes) { // We have to transform the indices into local indices, since // there might be sorting or filtering in effect. @@ -210,10 +208,10 @@ void DiveListView::diveSelectionChanged(const QVector &indexes, boo if (!localIndex.isValid()) continue; - s->select(localIndex, flags); + s->select(localIndex, QItemSelectionModel::Rows | QItemSelectionModel::Select); // If an item of a not-yet expanded trip is selected, expand the trip. - if (select && localIndex.parent().isValid() && !isExpanded(localIndex.parent())) { + if (localIndex.parent().isValid() && !isExpanded(localIndex.parent())) { setAnimated(false); expand(localIndex.parent()); setAnimated(true); -- cgit v1.2.3-70-g09d2