Reset keyboard selection when using mouse rubberband to select items

This relates to Bug 1961

konqueror/listview/konq_listviewwidget.cc

@@ -406,11 +406,8 @@ void KonqBaseListViewWidget::initConfig()
    updateListContents();
 }
 
-void KonqBaseListViewWidget::contentsMousePressEvent( TQMouseEvent *e )
+void KonqBaseListViewWidget::contentsMousePressEvent( TQMouseEvent *e ) {
-{
+	if ( m_rubber ) {
-   if ( m_rubber )
-   {
-
 		TQRect r( m_rubber->normalize() );
 		delete m_rubber;
 		m_rubber = 0;
@@ -428,37 +425,34 @@ void KonqBaseListViewWidget::contentsMousePressEvent( TQMouseEvent *e )
 		TDEListView::contentsMousePressEvent( e );
 	}
 	else {
-      if ( e->button() == Qt::LeftButton )
+		if ( e->button() == Qt::LeftButton ) {
-      {
 			m_rubber = new TQRect( e->x(), e->y(), 0, 0 );
 			clearSelection();
 			emit selectionChanged();
 			m_fileTip->setItem( 0 );
 		}
-      if ( e->button() != Qt::RightButton )
+		if ( e->button() != Qt::RightButton ) {
 			TQListView::contentsMousePressEvent( e );
 		}
+	}
+
 	// Store list of selected items at mouse-press time.
 	// This is used when autoscrolling (why?)
 	// and during dnd (the target item is temporarily selected)
 	selectedItems( m_selected );
 }
 
-void KonqBaseListViewWidget::contentsMouseReleaseEvent( TQMouseEvent *e )
+void KonqBaseListViewWidget::contentsMouseReleaseEvent( TQMouseEvent *e ) {
-{
+	if ( m_rubber ) {
-   if ( m_rubber )
+		resetKeyboardSelectionOperation();
-   {
-
 		TQRect r( m_rubber->normalize() );
 		delete m_rubber;
 		m_rubber = 0;
 		repaintContents( r, FALSE );
 	}
 
-   if ( m_scrollTimer )
+	if ( m_scrollTimer ) {
-   {
+		disconnect( m_scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoScroll() ) );
-      disconnect( m_scrollTimer, TQT_SIGNAL( timeout() ),
-                  this, TQT_SLOT( slotAutoScroll() ) );
 		m_scrollTimer->stop();
 		delete m_scrollTimer;
 		m_scrollTimer = 0;
@@ -558,7 +552,6 @@ void KonqBaseListViewWidget::drawRubber( TQPainter *p )
    style().tqdrawPrimitive( TQStyle::PE_RubberBand, p,
                           TQRect( pt.x(), pt.y(), m_rubber->width(), m_rubber->height() ),
                           colorGroup(), TQStyle::Style_Default, colorGroup().base() );
-   
 }
 
 void KonqBaseListViewWidget::slotAutoScroll()
@@ -570,6 +563,7 @@ void KonqBaseListViewWidget::slotAutoScroll()
 
    const TQPoint pos = viewport()->mapFromGlobal( TQCursor::pos() );
    const TQPoint vc = viewportToContents( pos );
+   TQListViewItem *at = itemAt( vc );
 
    if ( vc == m_rubber->bottomRight() )
       return;
@@ -626,6 +620,7 @@ void KonqBaseListViewWidget::slotAutoScroll()
             if ( !cur->isSelected() && cur->isSelectable() )
 	    {
                setSelected( cur, true );
+               setActiveMultiSelectItem( at );
                changed = TRUE;
                rr = rr.unite( itemRect( cur ) );
 	    }
@@ -641,6 +636,7 @@ void KonqBaseListViewWidget::slotAutoScroll()
 	    if ( !m_selected || !m_selected->contains( (KonqBaseListViewItem*)cur ) )
 	    {
                setSelected( cur, false );
+               setActiveMultiSelectItem( at );
 	    }
 	 }
 
@@ -662,6 +658,7 @@ void KonqBaseListViewWidget::slotAutoScroll()
             if ( !cur->isSelected() && cur->isSelectable() )
 	    {
                setSelected( cur, true );
+               setActiveMultiSelectItem( at );
                changed = TRUE;
                rr = rr.unite( itemRect( cur ) );
 	    }
@@ -677,6 +674,7 @@ void KonqBaseListViewWidget::slotAutoScroll()
             if ( !m_selected || !m_selected->contains( (KonqBaseListViewItem*)cur ) )
 	    {
                setSelected( cur, false );
+               setActiveMultiSelectItem( at );
 	    }
 	 }