From 1f456943589f5bd950488d06a4804a927eb8ee61 Mon Sep 17 00:00:00 2001 From: Garux Date: Sun, 4 Feb 2024 10:08:29 +0600 Subject: [PATCH] Revert "fix build in ubuntu via using deprecated Qt function" This reverts commit f7977eb85182b0235b7075649b72f68841d5e7c3. --- radiant/camwindow.cpp | 4 ++-- radiant/xywindow.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/radiant/camwindow.cpp b/radiant/camwindow.cpp index 72c33688..aa1bc1d9 100644 --- a/radiant/camwindow.cpp +++ b/radiant/camwindow.cpp @@ -1306,7 +1306,7 @@ static void wheelmove_scroll( const QWheelEvent& event, CamWnd& camwnd ){ } 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 ) { if ( cam.movementflags & MOVE_FOCUS ) { @@ -1320,7 +1320,7 @@ static void wheelmove_scroll( const QWheelEvent& event, CamWnd& camwnd ){ } 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 ); } } diff --git a/radiant/xywindow.cpp b/radiant/xywindow.cpp index 26d9ba72..67f27d0b 100644 --- a/radiant/xywindow.cpp +++ b/radiant/xywindow.cpp @@ -531,10 +531,10 @@ protected: g_pParentWnd->SetActiveXY( &m_xywnd ); } 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 ) { - m_xywnd.ZoomOutWithMouse( event->x() * m_scale, event->y() * m_scale ); + m_xywnd.ZoomOutWithMouse( event->position().x() * m_scale, event->position().y() * m_scale ); } }