From e8ff662d734b6276be60a0998bdb20fb520ca2fd Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Fri, 4 Mar 2005 10:51:04 +0000
Subject: [PATCH] Fix a bug: impossible to perform multiple selection in the
 Object Browser (SMESH7427 + PAL8232)

---
 src/SALOMEGUI/QAD_ObjectBrowser.cxx | 41 ++++++++++++++++++++++++-----
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/src/SALOMEGUI/QAD_ObjectBrowser.cxx b/src/SALOMEGUI/QAD_ObjectBrowser.cxx
index e97f591ed..958cd0b28 100644
--- a/src/SALOMEGUI/QAD_ObjectBrowser.cxx
+++ b/src/SALOMEGUI/QAD_ObjectBrowser.cxx
@@ -340,8 +340,11 @@ void QAD_ObjectBrowser::setupListView()
 
 /*!
   Event filter
+  We can use the following static variables for drag-n-drop operations because it is impossible
+  to perform several dragging operation at one time.
 */
-
+static bool dragged = false;
+static QStringList draggedlist;
 bool QAD_ObjectBrowser::eventFilter( QObject* o, QEvent* e )
 {
   QAD_Desktop* Desktop     = (QAD_Desktop*) QAD_Application::getDesktop();
@@ -357,7 +360,7 @@ bool QAD_ObjectBrowser::eventFilter( QObject* o, QEvent* e )
       // Test if clicked on selection and start drag if necessary
       QMouseEvent* me = ( QMouseEvent* )e;
       QAD_ObjectBrowserItem* item = ( QAD_ObjectBrowserItem* )( myUseCaseView->itemAt( me->pos() ) );
-      if ( item && item->isSelected() && me->button() == LeftButton) {
+      if ( item && item->isSelected() && me->button() == LeftButton && !(me->state() & (ControlButton | ShiftButton)) ) {
 	if ( me->pos().x() > myUseCaseView->header()->sectionPos( myUseCaseView->header()->mapToIndex( 0 ) ) +
 	                     myUseCaseView->treeStepSize() * ( item->depth() + ( myUseCaseView->rootIsDecorated() ? 1 : 0 ) ) + 
 			     myUseCaseView->itemMargin() ||
@@ -378,13 +381,40 @@ bool QAD_ObjectBrowser::eventFilter( QObject* o, QEvent* e )
 	    }
 	  }
 	  if ( done && !entryList.isEmpty() ) {
-	    QTextDrag *d = new QTextDrag( entryList.join("*"), myUseCaseView->viewport() );
-	    d->dragMove();
+	    draggedlist = entryList;
+	    // vsr 03/03/05 - start dragging only if mouse starts moving after pressing left button (see below)
+	    //QTextDrag *d = new QTextDrag( entryList.join("*"), myUseCaseView->viewport() );
+	    //d->dragMove();
+	    dragged = true;
 	    return true;
 	  }
 	}
       }
     }
+    else if ( e->type() == QEvent::MouseMove ) {
+      // vsr 03/03/05 - start dragging only if mouse starts moving
+      if ( dragged ) {
+	if ( !draggedlist.isEmpty() ) {
+	  QTextDrag *d = new QTextDrag( draggedlist.join("*"), myUseCaseView->viewport() );
+	  d->dragMove();
+	}
+	dragged = false;
+	draggedlist.clear();
+      }
+    }
+    else if ( e->type() == QEvent::MouseButtonRelease ) {
+      // vsr 03/03/05 - if dragging was not performed (mouse was not moved after mouse press)
+      // simulate the ordinary mouse click that means just selection of the one item
+      QMouseEvent* me = ( QMouseEvent* )e;
+      if ( dragged ) {
+	draggedlist.clear();
+	dragged = false;
+	QAD_ObjectBrowserItem* item = ( QAD_ObjectBrowserItem* )( myUseCaseView->itemAt( me->pos() ) );
+	myUseCaseView->clearSelection();
+	myUseCaseView->setSelected( item, true );
+	myUseCaseView->setCurrentItem( item );
+      }
+    }
     else if ( e->type() == QEvent::DragMove ) {
       QDragMoveEvent* dme = ( QDragMoveEvent* )e;
       if ( dme->source() == myUseCaseView->viewport() ) {
@@ -1423,9 +1453,6 @@ void QAD_ObjectBrowser::showUseCasePopupMenu(QListViewItem* theItem)
 */
 void QAD_ObjectBrowser::onSelectedItem()
 {
-  if (currentPage()==myListView)
-    myUseCaseView->clearSelection();
-
   QListView* whoIs;
   if ( sender()->inherits("QListView") )
     whoIs = (QListView*)sender();
-- 
2.39.2