Revert "fix build in ubuntu via using deprecated Qt function"
This reverts commit f7977eb851.
This commit is contained in:
parent
60e3e48dd0
commit
1f45694358
|
|
@ -1306,7 +1306,7 @@ static void wheelmove_scroll( const QWheelEvent& event, CamWnd& camwnd ){
|
||||||
}
|
}
|
||||||
|
|
||||||
Camera_Freemove_updateAxes( cam );
|
Camera_Freemove_updateAxes( cam );
|
||||||
camera_zoom( camwnd, event.x(), event.y(), g_camwindow_globals_private.m_nScrollMoveSpeed );
|
camera_zoom( camwnd, event.position().x(), event.position().y(), g_camwindow_globals_private.m_nScrollMoveSpeed );
|
||||||
}
|
}
|
||||||
else if ( angleDelta < 0 ) {
|
else if ( angleDelta < 0 ) {
|
||||||
if ( cam.movementflags & MOVE_FOCUS ) {
|
if ( cam.movementflags & MOVE_FOCUS ) {
|
||||||
|
|
@ -1320,7 +1320,7 @@ static void wheelmove_scroll( const QWheelEvent& event, CamWnd& camwnd ){
|
||||||
}
|
}
|
||||||
|
|
||||||
Camera_Freemove_updateAxes( cam );
|
Camera_Freemove_updateAxes( cam );
|
||||||
camera_zoom( camwnd, event.x(), event.y(), -g_camwindow_globals_private.m_nScrollMoveSpeed );
|
camera_zoom( camwnd, event.position().x(), event.position().y(), -g_camwindow_globals_private.m_nScrollMoveSpeed );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -531,10 +531,10 @@ protected:
|
||||||
g_pParentWnd->SetActiveXY( &m_xywnd );
|
g_pParentWnd->SetActiveXY( &m_xywnd );
|
||||||
}
|
}
|
||||||
if ( event->angleDelta().y() > 0 ) {
|
if ( event->angleDelta().y() > 0 ) {
|
||||||
m_xywnd.ZoomInWithMouse( event->x() * m_scale, event->y() * m_scale );
|
m_xywnd.ZoomInWithMouse( event->position().x() * m_scale, event->position().y() * m_scale );
|
||||||
}
|
}
|
||||||
else if ( event->angleDelta().y() < 0 ) {
|
else if ( event->angleDelta().y() < 0 ) {
|
||||||
m_xywnd.ZoomOutWithMouse( event->x() * m_scale, event->y() * m_scale );
|
m_xywnd.ZoomOutWithMouse( event->position().x() * m_scale, event->position().y() * m_scale );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user