Change zoom behaviour on ViewArea:
Now it requires a combination of Ctrl + mouse wheel
This commit is contained in:
1 parent
20e2ee38c0
commit
1c122a4a82
3 files changed
+24
-15
No files matched your search
+21
-14
@@ -109,6 +109,14 @@ void ViewArea::clearMask()
|
||||
// return QSize( w, h );
|
||||
// }
|
||||
|
||||
Void ViewArea::setZoomFactor( Double f )
|
||||
{
|
||||
m_zoomFactor = f;
|
||||
|
||||
updateSize();
|
||||
update();
|
||||
}
|
||||
|
||||
Void ViewArea::zoomChangeEvent(Double factor, QPoint center )
|
||||
{
|
||||
Double zoomFactor;
|
||||
@@ -134,14 +142,6 @@ Void ViewArea::zoomChangeEvent(Double factor, QPoint center )
|
||||
|
||||
}
|
||||
|
||||
void ViewArea::setZoomFactor( double f )
|
||||
{
|
||||
m_zoomFactor = f;
|
||||
|
||||
updateSize();
|
||||
update();
|
||||
}
|
||||
|
||||
void ViewArea::setMode( ViewMode mode )
|
||||
{
|
||||
if( m_mode == mode )
|
||||
@@ -523,13 +523,16 @@ void ViewArea::wheelEvent( QWheelEvent *event )
|
||||
{
|
||||
Double factor;
|
||||
|
||||
factor = 0.001 * event->delta();
|
||||
if(factor>0)
|
||||
factor=1.25;
|
||||
else
|
||||
factor=0.8;
|
||||
if( event->modifiers() & Qt::ControlModifier )
|
||||
{
|
||||
factor = 0.001 * event->delta();
|
||||
if(factor>0)
|
||||
factor=1.25;
|
||||
else
|
||||
factor=0.8;
|
||||
zoomChangeEvent( factor , event->pos() );
|
||||
}
|
||||
|
||||
zoomChangeEvent( factor , event->pos() );
|
||||
}
|
||||
|
||||
void ViewArea::mousePressEvent( QMouseEvent *event )
|
||||
@@ -538,6 +541,10 @@ void ViewArea::mousePressEvent( QMouseEvent *event )
|
||||
|
||||
QPoint vpos = windowToView( event->pos() );
|
||||
|
||||
if( event->button() == Qt::MidButton )
|
||||
{
|
||||
|
||||
}
|
||||
if( event->button() == Qt::LeftButton )
|
||||
{
|
||||
if( tool() == NavigationTool )
|
||||
|
||||
Reference in new issue
Block a user