mirror of
https://github.com/hyprwm/Hyprland
synced 2024-11-25 23:05:58 +01:00
layers: minor fixes for new animations
This commit is contained in:
parent
4bc669f933
commit
29cdd7de1f
2 changed files with 14 additions and 1 deletions
|
@ -325,6 +325,19 @@ void Events::listener_commitLayerSurface(void* owner, void* data) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (layersurface->realPosition.goalv() != layersurface->geometry.pos()) {
|
||||||
|
if (layersurface->realPosition.isBeingAnimated())
|
||||||
|
layersurface->realPosition = layersurface->geometry.pos();
|
||||||
|
else
|
||||||
|
layersurface->realPosition.setValueAndWarp(layersurface->geometry.pos());
|
||||||
|
}
|
||||||
|
if (layersurface->realSize.goalv() != layersurface->geometry.size()) {
|
||||||
|
if (layersurface->realSize.isBeingAnimated())
|
||||||
|
layersurface->realSize = layersurface->geometry.size();
|
||||||
|
else
|
||||||
|
layersurface->realSize.setValueAndWarp(layersurface->geometry.size());
|
||||||
|
}
|
||||||
|
|
||||||
if (layersurface->layerSurface->current.keyboard_interactive &&
|
if (layersurface->layerSurface->current.keyboard_interactive &&
|
||||||
(!g_pCompositor->m_sSeat.mouse || !g_pCompositor->m_sSeat.mouse->currentConstraint) // don't focus if constrained
|
(!g_pCompositor->m_sSeat.mouse || !g_pCompositor->m_sSeat.mouse->currentConstraint) // don't focus if constrained
|
||||||
&& !layersurface->keyboardExclusive && layersurface->mapped) {
|
&& !layersurface->keyboardExclusive && layersurface->mapped) {
|
||||||
|
|
|
@ -54,7 +54,7 @@ void SLayerSurface::applyRules() {
|
||||||
xray = configStringToInt(vars[1]);
|
xray = configStringToInt(vars[1]);
|
||||||
} catch (...) {}
|
} catch (...) {}
|
||||||
} else if (rule.rule.starts_with("animation")) {
|
} else if (rule.rule.starts_with("animation")) {
|
||||||
CVarList vars{rule.rule, 0, 's'};
|
CVarList vars{rule.rule, 2, 's'};
|
||||||
animationStyle = vars[1];
|
animationStyle = vars[1];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue