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

xdg_shell: fix nested xdg_positioner calculations

Browse source 
ref #6240
This commit is contained in:
Vaxry 2024-06-07 20:23:35 +02:00
parent 6b6b02c27a
commit c31d9ef417
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/protocols/XDGShell.cpp
View file

@ -528,7 +528,7 @@ CBox CXDGPositionerRules::getPosition(const CBox& constraint, const Vector2D& pa
bool success = predictedBox.inside(constraint); bool success = predictedBox.inside(constraint);
if (success) if (success)
return predictedBox; return predictedBox.translate(-parentCoord - constraint.pos());
if (state.constraintAdjustment & (XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_FLIP_X | XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_FLIP_Y)) { if (state.constraintAdjustment & (XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_FLIP_X | XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_FLIP_Y)) {
// attempt to flip // attempt to flip
@ -547,7 +547,7 @@ CBox CXDGPositionerRules::getPosition(const CBox& constraint, const Vector2D& pa
success = false; success = false;
if (success) if (success)
return test; return test.translate(-parentCoord - constraint.pos());
} }
// if flips fail, we will slide and remember. // if flips fail, we will slide and remember.
@ -584,7 +584,7 @@ CBox CXDGPositionerRules::getPosition(const CBox& constraint, const Vector2D& pa
success = test.copy().expand(-1).inside(constraint); success = test.copy().expand(-1).inside(constraint);
if (success) if (success)
return test; return test.translate(-parentCoord - constraint.pos());
} }
if (state.constraintAdjustment & (XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_RESIZE_X | XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_RESIZE_Y)) { if (state.constraintAdjustment & (XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_RESIZE_X | XDG_POSITIONER_CONSTRAINT_ADJUSTMENT_RESIZE_Y)) {
@ -613,7 +613,7 @@ CBox CXDGPositionerRules::getPosition(const CBox& constraint, const Vector2D& pa
success = test.copy().expand(-1).inside(constraint); success = test.copy().expand(-1).inside(constraint);
if (success) if (success)
return test; return test.translate(-parentCoord - constraint.pos());
} }
LOGM(WARN, "Compositor/client bug: xdg_positioner couldn't find a place"); LOGM(WARN, "Compositor/client bug: xdg_positioner couldn't find a place");