summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMaximilian Seidler <78690852+PaideiaDilemma@users.noreply.github.com>2025-01-11 16:38:04 +0000
committerGitHub <noreply@github.com>2025-01-11 16:38:04 +0000
commit2778aff08fba59a34b404751039d7acb6bfb3bdf (patch)
tree0c4be9c126df4b61737b568e8841f3fffad7e2bb /src
parent9e4f90aedf2f51d3e7f3dbe5391cb193aa0bddf5 (diff)
animations: fix XWayland cursor glitch and refactor skill issues (#9033)
Diffstat (limited to 'src')
-rw-r--r--src/events/Windows.cpp2
-rw-r--r--src/managers/XWaylandManager.cpp2
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<CBaseAnimatedVariable> 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