h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 15:17:27 +08:00
Code Issues Releases Wiki Activity

Fix position changing when origin updates during a drag

Browse Source
This commit is contained in:
Dean Herbert 2024-05-04 13:28:33 +08:00
parent 0b61e2cd42
commit e7ca02ffde
No known key found for this signature in database
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Overlays/SkinEditor/SkinBlueprint.cs
View File

@ -40,7 +40,9 @@ namespace osu.Game.Overlays.SkinEditor
public override bool Contains(Vector2 screenSpacePos) => drawableQuad.Contains(screenSpacePos); public override bool Contains(Vector2 screenSpacePos) => drawableQuad.Contains(screenSpacePos);
public override Vector2 ScreenSpaceSelectionPoint => drawable.ToScreenSpace(drawable.OriginPosition); public override Vector2 ScreenSpaceSelectionPoint =>
// Important to use a stable position (not based on origin) as origin may be automatically updated during drag operations.
drawable.ScreenSpaceDrawQuad.Centre;
protected override bool ReceivePositionalInputAtSubTree(Vector2 screenSpacePos) => protected override bool ReceivePositionalInputAtSubTree(Vector2 screenSpacePos) =>
drawableQuad.Contains(screenSpacePos); drawableQuad.Contains(screenSpacePos);

6
osu.Game/Overlays/SkinEditor/SkinSelectionHandler.cs
View File

@ -202,10 +202,10 @@ namespace osu.Game.Overlays.SkinEditor
var item = c.Item; var item = c.Item;
Drawable drawable = (Drawable)item; Drawable drawable = (Drawable)item;
drawable.Position += drawable.ScreenSpaceDeltaToParentSpace(moveEvent.ScreenSpaceDelta);
if (!item.UsesFixedAnchor) if (!item.UsesFixedAnchor)
ApplyClosestAnchorOrigin(drawable); ApplyClosestAnchorOrigin(drawable);
drawable.Position += drawable.ScreenSpaceDeltaToParentSpace(moveEvent.ScreenSpaceDelta);
} }
return true; return true;
@ -332,7 +332,7 @@ namespace osu.Game.Overlays.SkinEditor
applyOrigin(drawable, origin); applyOrigin(drawable, origin);
if (item.UsesFixedAnchor) if (!item.UsesFixedAnchor)
ApplyClosestAnchorOrigin(drawable); ApplyClosestAnchorOrigin(drawable);
} }