New item (FontItem), allowing to show information about font setting and to select...

[modules/gui.git] / src / SVTK / SVTK_RenderWindowInteractor.cxx

diff --git a/src/SVTK/SVTK_RenderWindowInteractor.cxx b/src/SVTK/SVTK_RenderWindowInteractor.cxx
index a3ecadfc8dc114dd858220b408affb7eb40b7bb4..a80733492639df46b8de5244c69ff91eb1a4bfe7 100644 (file)
--- a/src/SVTK/SVTK_RenderWindowInteractor.cxx
+++ b/src/SVTK/SVTK_RenderWindowInteractor.cxx
@@ -436,7 +436,7 @@ SVTK_RenderWindowInteractor
                                      (event->state() & ShiftButton), 
                                      event->x(), event->y() ) ;
 
-  if(myInteractorStyle->GetState() == VTK_INTERACTOR_STYLE_CAMERA_NONE){
+  if(myInteractorStyle->GetState() == VTK_INTERACTOR_STYLE_CAMERA_NONE && !( event->state() & KeyButtonMask )){
     QContextMenuEvent aEvent( QContextMenuEvent::Mouse,
                               event->pos(), event->globalPos(),
                               event->state() );
@@ -913,6 +913,9 @@ SVTK_RenderWindowInteractor
               TUpdateActor theFun)
 {
   (*theFun)(theMapIndex,theMapActor,theActor);
+  float aPos[3];
+  theMapActor->GetPosition(aPos);
+  theActor->SetPosition(aPos);
 }