#4220 Apply picking cursor only when over a 3d View

This commit is contained in:
Gaute Lindkvist
2019-03-22 15:55:51 +01:00
parent ef182da8a9
commit 44f3882ecb
5 changed files with 52 additions and 10 deletions

View File

@@ -20,6 +20,7 @@
#include "RiaApplication.h"
#include "RiuViewerCommands.h"
#include "RiuViewer.h"
#include "Rim3dView.h"
#include "RimIntersection.h"
@@ -49,7 +50,7 @@ RicMeasurementPickEventHandler* RicMeasurementPickEventHandler::instance()
//--------------------------------------------------------------------------------------------------
void RicMeasurementPickEventHandler::registerAsPickEventHandler()
{
RiaApplication::instance()->setOverrideCursor(Qt::CrossCursor);
RiuViewer::setHoverCursor(Qt::CrossCursor);
RiuViewerCommands::setPickEventHandler(RicMeasurementPickEventHandler::instance());
}
@@ -58,7 +59,7 @@ void RicMeasurementPickEventHandler::registerAsPickEventHandler()
//--------------------------------------------------------------------------------------------------
void RicMeasurementPickEventHandler::unregisterAsPickEventHandler()
{
RiaApplication::instance()->restoreOverrideCursor();
RiuViewer::clearHoverCursor();
RiuViewerCommands::removePickEventHandlerIfActive(RicMeasurementPickEventHandler::instance());
}

View File

@@ -19,6 +19,7 @@
#include "RiaApplication.h"
#include "Rim3dView.h"
#include "RiuViewer.h"
#include "cafDisplayCoordTransform.h"
#include "cafSelectionManager.h"
@@ -52,7 +53,7 @@ bool RicVec3dPickEventHandler::handle3dPickEvent(const Ric3dPickEvent& eventObje
void RicVec3dPickEventHandler::registerAsPickEventHandler()
{
Ric3dViewPickEventHandler::registerAsPickEventHandler();
RiaApplication::instance()->setOverrideCursor(Qt::CrossCursor);
RiuViewer::setHoverCursor(Qt::CrossCursor);
}
//--------------------------------------------------------------------------------------------------
@@ -60,5 +61,5 @@ void RicVec3dPickEventHandler::registerAsPickEventHandler()
//--------------------------------------------------------------------------------------------------
void RicVec3dPickEventHandler::notifyUnregistered()
{
RiaApplication::instance()->restoreOverrideCursor();
RiuViewer::clearHoverCursor();
}

View File

@@ -29,6 +29,7 @@
#include "RimUserDefinedPolylinesAnnotation.h"
#include "RiuViewerCommands.h"
#include "RiuViewer.h"
#include "RivPolylinesAnnotationSourceInfo.h"
@@ -55,7 +56,7 @@ RicPolylineTargetsPickEventHandler::~RicPolylineTargetsPickEventHandler() {}
//--------------------------------------------------------------------------------------------------
void RicPolylineTargetsPickEventHandler::registerAsPickEventHandler()
{
RiaApplication::instance()->setOverrideCursor(Qt::CrossCursor);
RiuViewer::setHoverCursor(Qt::CrossCursor);
Ric3dViewPickEventHandler::registerAsPickEventHandler();
}
@@ -64,7 +65,7 @@ void RicPolylineTargetsPickEventHandler::registerAsPickEventHandler()
//--------------------------------------------------------------------------------------------------
void RicPolylineTargetsPickEventHandler::notifyUnregistered()
{
RiaApplication::instance()->restoreOverrideCursor();
RiuViewer::clearHoverCursor();
}
//--------------------------------------------------------------------------------------------------