From 2778aff08fba59a34b404751039d7acb6bfb3bdf Mon Sep 17 00:00:00 2001 From: Maximilian Seidler <78690852+PaideiaDilemma@users.noreply.github.com> Date: Sat, 11 Jan 2025 16:38:04 +0000 Subject: [PATCH] animations: fix XWayland cursor glitch and refactor skill issues (#9033) --- src/events/Windows.cpp | 2 +- src/managers/XWaylandManager.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/events/Windows.cpp b/src/events/Windows.cpp index ff69e83f..14e89b4b 100644 --- a/src/events/Windows.cpp +++ b/src/events/Windows.cpp @@ -38,7 +38,7 @@ static void setVector2DAnimToMove(WP pav) { animvar->setConfig(g_pConfigManager->getAnimationPropertyConfig("windowsMove")); const auto PHLWINDOW = animvar->m_Context.pWindow.lock(); - if (PHLWINDOW && PHLWINDOW->m_vRealPosition->isBeingAnimated() && PHLWINDOW->m_vRealSize->isBeingAnimated()) + if (PHLWINDOW && !PHLWINDOW->m_vRealPosition->isBeingAnimated() && !PHLWINDOW->m_vRealSize->isBeingAnimated()) PHLWINDOW->m_bAnimatingIn = false; } diff --git a/src/managers/XWaylandManager.cpp b/src/managers/XWaylandManager.cpp index bc988f39..ab0bfb88 100644 --- a/src/managers/XWaylandManager.cpp +++ b/src/managers/XWaylandManager.cpp @@ -123,7 +123,7 @@ void CHyprXWaylandManager::setWindowSize(PHLWINDOW pWindow, Vector2D size, bool // calculate pos // TODO: this should be decoupled from setWindowSize IMO - Vector2D windowPos = pWindow->m_vRealPosition->value(); + Vector2D windowPos = pWindow->m_vRealPosition->goal(); if (pWindow->m_bIsX11 && PMONITOR) { windowPos -= PMONITOR->vecPosition; // normalize to monitor