Commit 1f05971f authored by Julien Michel's avatar Julien Michel
Browse files

BUG: Fixing issue #1197 (adding a default fallback value for picking behaviour...

BUG: Fixing issue #1197 (adding a default fallback value for picking behaviour that can be set to false for quicklook view
parent 1b94bc4d
......@@ -990,7 +990,8 @@ MainWindow
);
quicklookView->SetPickingEnabled( false );
quicklookView->SetPickingDefaultStatus( false );
quicklookView->setMinimumSize( 64, 64 );
quicklookView->setMaximumSize( 512, 512 );
quicklookView->setSizePolicy( QSizePolicy::Maximum, QSizePolicy::Maximum );
......
......@@ -76,6 +76,7 @@ ImageViewWidget
Qt::WindowFlags flags ) :
QGLWidget( parent, shareWidget, flags ),
m_IsPickingEnabled( true ),
m_PickingDefaultStatus( true ),
m_Manipulator( NULL ),
m_Renderer( NULL )
#if USE_XP_REGION_OPTIM
......@@ -853,7 +854,7 @@ ImageViewWidget
m_Manipulator->MouseReleaseEvent(event);
// Reactivate picking after drag
m_IsPickingEnabled = true;
m_IsPickingEnabled = m_PickingDefaultStatus;
}
/*******************************************************************************/
......@@ -1154,6 +1155,14 @@ ImageViewWidget
m_IsPickingEnabled = isEnabled;
}
/*****************************************************************************/
void
ImageViewWidget
::SetPickingDefaultStatus( bool defaultStatus )
{
m_PickingDefaultStatus = defaultStatus;
}
/*******************************************************************************/
bool
ImageViewWidget
......
......@@ -157,6 +157,11 @@ public:
/**
*/
void SetPickingEnabled( bool );
/**
* This allows to set the fallback behaviour for picking
*/
void SetPickingDefaultStatus( bool );
/**
*/
bool IsPickingEnabled() const;
......@@ -269,6 +274,7 @@ protected:
/**
*/
bool m_IsPickingEnabled : 1;
bool m_PickingDefaultStatus : 1;
/*-[ PRIVATE SECTION ]-----------------------------------------------------*/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment