mirror of
https://github.com/hyprwm/Hyprland
synced 2025-01-10 14:09:49 +01:00
window: fixup fade out animation on silent moves
This commit is contained in:
parent
308b1f3afb
commit
67e1e46f9b
1 changed files with 3 additions and 3 deletions
|
@ -413,10 +413,10 @@ void CWindow::moveToWorkspace(PHLWORKSPACE pWorkspace) {
|
||||||
|
|
||||||
const auto OLDWORKSPACE = m_pWorkspace;
|
const auto OLDWORKSPACE = m_pWorkspace;
|
||||||
|
|
||||||
m_iMonitorMovedFrom = OLDWORKSPACE ? OLDWORKSPACE->monitorID() : -1;
|
|
||||||
m_fMovingToWorkspaceAlpha->setCallbackOnEnd([this](auto) { m_iMonitorMovedFrom = -1; });
|
|
||||||
m_fMovingToWorkspaceAlpha->setValueAndWarp(1.F);
|
m_fMovingToWorkspaceAlpha->setValueAndWarp(1.F);
|
||||||
*m_fMovingToWorkspaceAlpha = 0.F;
|
*m_fMovingToWorkspaceAlpha = 0.F;
|
||||||
|
m_fMovingToWorkspaceAlpha->setCallbackOnEnd([this](auto) { m_iMonitorMovedFrom = -1; });
|
||||||
|
m_iMonitorMovedFrom = OLDWORKSPACE ? OLDWORKSPACE->monitorID() : -1;
|
||||||
|
|
||||||
m_pWorkspace = pWorkspace;
|
m_pWorkspace = pWorkspace;
|
||||||
|
|
||||||
|
@ -541,9 +541,9 @@ void CWindow::onMap() {
|
||||||
m_fMovingFromWorkspaceAlpha->resetAllCallbacks();
|
m_fMovingFromWorkspaceAlpha->resetAllCallbacks();
|
||||||
|
|
||||||
m_fMovingFromWorkspaceAlpha->setValueAndWarp(1.F);
|
m_fMovingFromWorkspaceAlpha->setValueAndWarp(1.F);
|
||||||
m_fBorderAngleAnimationProgress->setCallbackOnEnd([&](WP<CBaseAnimatedVariable> p) { onBorderAngleAnimEnd(p); }, false);
|
|
||||||
|
|
||||||
m_fBorderAngleAnimationProgress->setValueAndWarp(0.f);
|
m_fBorderAngleAnimationProgress->setValueAndWarp(0.f);
|
||||||
|
m_fBorderAngleAnimationProgress->setCallbackOnEnd([&](WP<CBaseAnimatedVariable> p) { onBorderAngleAnimEnd(p); }, false);
|
||||||
*m_fBorderAngleAnimationProgress = 1.f;
|
*m_fBorderAngleAnimationProgress = 1.f;
|
||||||
|
|
||||||
m_fMovingFromWorkspaceAlpha->setValueAndWarp(1.F);
|
m_fMovingFromWorkspaceAlpha->setValueAndWarp(1.F);
|
||||||
|
|
Loading…
Reference in a new issue