From: sln <sln@opencascade.com>
Date: Wed, 28 Nov 2007 15:02:36 +0000 (+0000)
Subject: Rollback to the one of previous version then pulling and rectangular selection worked... 
X-Git-Tag: CTH_V1_3~5
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=18d54b548beb935d239448d0e85f092a69eafaa5;p=modules%2Fgui.git

Rollback to the one of previous version then pulling and rectangular selection worked properly
---

diff --git a/src/GLViewer/GLViewer_Viewer2d.cxx b/src/GLViewer/GLViewer_Viewer2d.cxx
index fbd6b4f89..962d2e03f 100644
--- a/src/GLViewer/GLViewer_Viewer2d.cxx
+++ b/src/GLViewer/GLViewer_Viewer2d.cxx
@@ -938,12 +938,11 @@ void GLViewer_Viewer2d::startOperations( QMouseEvent* e )
     transPoint( x, y );
     GLViewer_Pnt point( x, y );
 
-    // moved to updateOperations() - see below
-    //if( e->button() == Qt::LeftButton && vp->startPulling( point ) )
-    //    return;
+    if( e->button() == Qt::LeftButton && vp->startPulling( point ) )
+      return;
 
     if( e->button() == Qt::LeftButton && !(vp->currentBlock() & BS_Selection) && !myGLContext->getCurrentObject() )
-        vp->startSelectByRect( e->x(), e->y() );
+      vp->startSelectByRect( e->x(), e->y() );
 }
 
 /*!
@@ -965,14 +964,14 @@ bool GLViewer_Viewer2d::updateOperations( QMouseEvent* e )
         return true;
     }
 
-    if( vp->isDragProcess() == GLViewer_ViewPort2d::inDrag )
+    /*if( vp->isDragProcess() == GLViewer_ViewPort2d::inDrag )
         return true;
 
     if( e->state() == Qt::LeftButton && vp->startPulling( point ) )
     {
         vp->finishSelectByRect();
         return true;
-    }
+    }*/
 
     if( !myGLContext->getCurrentObject() )
     {