yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3596
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Tue 2015-02-24 15:03:18 +0100
message:
  Fix body unselecting. (Closes: LP:1423130)
modified:
  gui/qt4/GLViewer.cpp
  gui/qt4/GLViewerMouse.cpp


--
lp:yade
https://code.launchpad.net/~yade-pkg/yade/git-trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription

=== modified file 'gui/qt4/GLViewer.cpp'
--- gui/qt4/GLViewer.cpp	2014-11-27 09:28:36 +0000
+++ gui/qt4/GLViewer.cpp	2015-02-24 14:03:18 +0000
@@ -162,7 +162,7 @@
 	/* special keys: Escape and Space */
 	else if(e->key()==Qt::Key_A){ toggleAxisIsDrawn(); return; }
 	else if(e->key()==Qt::Key_Escape){
-		if(!isManipulating()){ return; }
+		if(!isManipulating()){ setSelectedName(-1); return; }
 		else { resetManipulation(); displayMessage("Manipulating scene."); }
 	}
 	else if(e->key()==Qt::Key_Space){

=== modified file 'gui/qt4/GLViewerMouse.cpp'
--- gui/qt4/GLViewerMouse.cpp	2014-10-15 06:44:01 +0000
+++ gui/qt4/GLViewerMouse.cpp	2015-02-24 14:03:18 +0000
@@ -35,14 +35,10 @@
   setWheelBinding(Qt::NoModifier, CAMERA, ZOOM);
 
 #if QGLVIEWER_VERSION>=0x020500
-  setMouseBinding(Qt::ShiftModifier, Qt::LeftButton, SELECT);
-  
-  setMouseBinding(Qt::ShiftModifier, Qt::LeftButton, FRAME, ZOOM);
   setMouseBinding(Qt::ShiftModifier, Qt::RightButton, FRAME, ZOOM);
   setMouseBinding(Qt::ShiftModifier, Qt::MidButton, FRAME, TRANSLATE);
   setMouseBinding(Qt::ShiftModifier, Qt::RightButton, FRAME, ROTATE);
-    
-  setMouseBinding(Qt::NoModifier, Qt::RightButton, CAMERA, ZOOM);
+  
   setMouseBinding(Qt::NoModifier, Qt::MidButton, CAMERA, ZOOM);
   setMouseBinding(Qt::NoModifier, Qt::LeftButton, CAMERA, ROTATE);
   setMouseBinding(Qt::NoModifier, Qt::RightButton, CAMERA, TRANSLATE);