diff options
Diffstat (limited to 'src/helpers')
| -rw-r--r-- | src/helpers/Monitor.cpp | 2 | ||||
| -rw-r--r-- | src/helpers/MonitorZoomController.cpp | 11 | ||||
| -rw-r--r-- | src/helpers/MonitorZoomController.hpp | 6 |
3 files changed, 10 insertions, 9 deletions
diff --git a/src/helpers/Monitor.cpp b/src/helpers/Monitor.cpp index ad1439a1..5eb73868 100644 --- a/src/helpers/Monitor.cpp +++ b/src/helpers/Monitor.cpp @@ -1789,7 +1789,7 @@ uint8_t CMonitor::isTearingBlocked(bool full) { } } - if (g_pHyprOpenGL->m_renderData.mouseZoomFactor != 1.0) { + if (g_pHyprRenderer->m_renderData.mouseZoomFactor != 1.0) { reasons |= TC_ZOOM; if (!full) { Log::logger->log(Log::WARN, "Tearing commit requested but scale factor is not 1, ignoring"); diff --git a/src/helpers/MonitorZoomController.cpp b/src/helpers/MonitorZoomController.cpp index d90f416f..80c617e5 100644 --- a/src/helpers/MonitorZoomController.cpp +++ b/src/helpers/MonitorZoomController.cpp @@ -7,10 +7,10 @@ #include "desktop/DesktopTypes.hpp" #include "render/Renderer.hpp" -void CMonitorZoomController::zoomWithDetachedCamera(CBox& result, const SCurrentRenderData& m_renderData) { +void CMonitorZoomController::zoomWithDetachedCamera(CBox& result, const SRenderData& m_renderData) { const auto m = m_renderData.pMonitor; auto monbox = CBox(0, 0, m->m_size.x, m->m_size.y); - const auto ZOOM = m_renderData.mouseZoomFactor; + const auto ZOOM = g_pHyprRenderer->m_renderData.mouseZoomFactor; const auto MOUSE = g_pInputManager->getMouseCoordsInternal() - m->m_position; if (m_lastZoomLevel != ZOOM) { @@ -68,10 +68,10 @@ void CMonitorZoomController::zoomWithDetachedCamera(CBox& result, const SCurrent result = monbox; } -void CMonitorZoomController::applyZoomTransform(CBox& monbox, const SCurrentRenderData& m_renderData) { +void CMonitorZoomController::applyZoomTransform(CBox& monbox, const SRenderData& m_renderData) { static auto PZOOMRIGID = CConfigValue<Hyprlang::INT>("cursor:zoom_rigid"); static auto PZOOMDETACHEDCAMERA = CConfigValue<Hyprlang::INT>("cursor:zoom_detached_camera"); - const auto ZOOM = m_renderData.mouseZoomFactor; + const auto ZOOM = g_pHyprRenderer->m_renderData.mouseZoomFactor; if (ZOOM == 1.0f) return; @@ -83,7 +83,8 @@ void CMonitorZoomController::applyZoomTransform(CBox& monbox, const SCurrentRend if (*PZOOMDETACHEDCAMERA && !INITANIM) zoomWithDetachedCamera(monbox, m_renderData); else { - const auto ZOOMCENTER = m_renderData.mouseZoomUseMouse ? (g_pInputManager->getMouseCoordsInternal() - m->m_position) * m->m_scale : m->m_transformedSize / 2.f; + const auto ZOOMCENTER = + g_pHyprRenderer->m_renderData.mouseZoomUseMouse ? (g_pInputManager->getMouseCoordsInternal() - m->m_position) * m->m_scale : m->m_transformedSize / 2.f; monbox.translate(-ZOOMCENTER).scale(ZOOM).translate(*PZOOMRIGID ? m->m_transformedSize / 2.0 : ZOOMCENTER); } diff --git a/src/helpers/MonitorZoomController.hpp b/src/helpers/MonitorZoomController.hpp index 4f7c9d7a..54c7376e 100644 --- a/src/helpers/MonitorZoomController.hpp +++ b/src/helpers/MonitorZoomController.hpp @@ -2,16 +2,16 @@ #include "./math/Math.hpp" -struct SCurrentRenderData; +struct SRenderData; class CMonitorZoomController { public: bool m_resetCameraState = true; - void applyZoomTransform(CBox& monbox, const SCurrentRenderData& m_renderData); + void applyZoomTransform(CBox& monbox, const SRenderData& m_renderData); private: - void zoomWithDetachedCamera(CBox& result, const SCurrentRenderData& m_renderData); + void zoomWithDetachedCamera(CBox& result, const SRenderData& m_renderData); CBox m_camera; float m_lastZoomLevel = 1.0f; |
