Sometimes, the penultimate item in the bounds would get deselected when it shouldn't - this is because lastIndex is always included in the toggle range, even if it needn't be toggled. Fixed now - hopefully, there are no more "elastic band selection" bugs, now :)

svn path=/trunk/KDE/kdebase/apps/; revision=876724

1 files changed, 15 insertions, 5 deletions

diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp
index a40e6236d..efdead0c7 100644
--- a/src/dolphindetailsview.cpp
+++ b/src/dolphindetailsview.cpp
@@ -742,7 +742,7 @@ void DolphinDetailsView::updateElasticBandSelection()
 
    do {
        QRect currIndexRect = visualRect(currIndex);
-       const QString name = m_controller->itemForIndex(currIndex).name();
+       const QString name = m_controller->itemForIndex(currIndex).name();       
        currIndexRect.setWidth(DolphinFileItemDelegate::nameColumnWidth(name, viewOptions()));
 
         // Update some optimisation info as we go.
@@ -783,10 +783,20 @@ void DolphinDetailsView::updateElasticBandSelection()
                                             allItemsInBoundDone ||
                                             currIndex.parent() != toggleIndexRangeBegin.parent());
        if (commitToggleIndexRange) {
-           itemsToToggle.select(toggleIndexRangeBegin, lastIndex );
-           // Immediately start a new range with currIndex?
-           if (needToToggleItem) {
-               toggleIndexRangeBegin = currIndex;
+           if (!allItemsInBoundDone) {
+               itemsToToggle.select(toggleIndexRangeBegin, lastIndex);
+               // Need to start a new range immediately with currIndex?
+               if (needToToggleItem)
+                   toggleIndexRangeBegin = currIndex;
+           }
+           else  {
+                // Final item in the bounds.  Is it also the beginning of a range?
+               if (toggleIndexRangeBegin == currIndex) {
+                   itemsToToggle.select(currIndex, currIndex);
+               }
+               else {
+                   itemsToToggle.select(toggleIndexRangeBegin, lastIndex);
+               }
            }
            formingToggleIndexRange = needToToggleItem;
        }