mirror of
https://github.com/hyprwm/Hyprland
synced 2025-01-11 23:29:47 +01:00
animations: fix XWayland cursor glitch and refactor skill issues (#9033)
This commit is contained in:
parent
9e4f90aedf
commit
2778aff08f
2 changed files with 2 additions and 2 deletions
|
@ -38,7 +38,7 @@ static void setVector2DAnimToMove(WP<CBaseAnimatedVariable> pav) {
|
||||||
animvar->setConfig(g_pConfigManager->getAnimationPropertyConfig("windowsMove"));
|
animvar->setConfig(g_pConfigManager->getAnimationPropertyConfig("windowsMove"));
|
||||||
|
|
||||||
const auto PHLWINDOW = animvar->m_Context.pWindow.lock();
|
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;
|
PHLWINDOW->m_bAnimatingIn = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -123,7 +123,7 @@ void CHyprXWaylandManager::setWindowSize(PHLWINDOW pWindow, Vector2D size, bool
|
||||||
|
|
||||||
// calculate pos
|
// calculate pos
|
||||||
// TODO: this should be decoupled from setWindowSize IMO
|
// 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) {
|
if (pWindow->m_bIsX11 && PMONITOR) {
|
||||||
windowPos -= PMONITOR->vecPosition; // normalize to monitor
|
windowPos -= PMONITOR->vecPosition; // normalize to monitor
|
||||||
|
|
Loading…
Reference in a new issue