hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-26 19:06:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

layers: add animation direction overrides

Browse source 
fixes #5285
This commit is contained in:
Vaxry 2024-03-28 01:39:17 +00:00
parent 93d0511471
commit 132ab8d035
1 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/helpers/WLClasses.cpp
View file

@ -65,12 +65,27 @@ void SLayerSurface::applyRules() {
void SLayerSurface::startAnimation(bool in, bool instant) { void SLayerSurface::startAnimation(bool in, bool instant) {
const auto ANIMSTYLE = animationStyle.value_or(realPosition.m_pConfig->pValues->internalStyle); const auto ANIMSTYLE = animationStyle.value_or(realPosition.m_pConfig->pValues->internalStyle);
if (ANIMSTYLE == "slide") { if (ANIMSTYLE.starts_with("slide")) {
// get closest edge // get closest edge
const auto MIDDLE = geometry.middle(); const auto MIDDLE = geometry.middle();
const auto PMONITOR = g_pCompositor->getMonitorFromVector(MIDDLE); const auto PMONITOR = g_pCompositor->getMonitorFromVector(MIDDLE);
int force = -1;
CVarList args(ANIMSTYLE, 0, 's');
if (args.size() > 1) {
const auto ARG2 = args[1];
if (ARG2 == "top")
force = 0;
else if (ARG2 == "bottom")
force = 1;
else if (ARG2 == "left")
force = 2;
else if (ARG2 == "right")
force = 3;
}
const std::array<Vector2D, 4> edgePoints = { const std::array<Vector2D, 4> edgePoints = {
PMONITOR->vecPosition + Vector2D{PMONITOR->vecSize.x / 2, 0}, PMONITOR->vecPosition + Vector2D{PMONITOR->vecSize.x / 2, 0},
PMONITOR->vecPosition + Vector2D{PMONITOR->vecSize.x / 2, PMONITOR->vecSize.y}, PMONITOR->vecPosition + Vector2D{PMONITOR->vecSize.x / 2, PMONITOR->vecSize.y},
@ -79,7 +94,8 @@ void SLayerSurface::startAnimation(bool in, bool instant) {
}; };
float closest = std::numeric_limits<float>::max(); float closest = std::numeric_limits<float>::max();
size_t leader = 0; int leader = force;
if (leader == -1) {
for (size_t i = 0; i < 4; ++i) { for (size_t i = 0; i < 4; ++i) {
float dist = MIDDLE.distance(edgePoints[i]); float dist = MIDDLE.distance(edgePoints[i]);
if (dist < closest) { if (dist < closest) {
@ -87,6 +103,7 @@ void SLayerSurface::startAnimation(bool in, bool instant) {
closest = dist; closest = dist;
} }
} }
}
realSize.setValueAndWarp(geometry.size()); realSize.setValueAndWarp(geometry.size());
alpha.setValueAndWarp(in ? 0.f : 1.f); alpha.setValueAndWarp(in ? 0.f : 1.f);