sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-20 21:17:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

Refactor updateDrawableAnchorIfUsingClosest

Browse Source
This commit is contained in:
Robin Avery 2021-06-08 09:25:49 -04:00
parent 6b127f50f2
commit 01da73daf2
No known key found for this signature in database
GPG Key ID: 0496DF10CEF7E226
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
osu.Game/Skinning/Editor/SkinSelectionHandler.cs
View File

@ -149,21 +149,29 @@ namespace osu.Game.Skinning.Editor
{ {
foreach (var c in SelectedBlueprints) foreach (var c in SelectedBlueprints)
{ {
Drawable drawable = (Drawable)c.Item; var skinnableDrawable = c.Item;
Drawable drawable = (Drawable)skinnableDrawable;
drawable.Position += drawable.ScreenSpaceDeltaToParentSpace(moveEvent.ScreenSpaceDelta); drawable.Position += drawable.ScreenSpaceDeltaToParentSpace(moveEvent.ScreenSpaceDelta);
if (c.Item.UsesFixedAnchor) continue; checkAndApplyClosestAnchor(skinnableDrawable);
var closestAnchor = getClosestAnchorForDrawable(drawable);
if (closestAnchor == drawable.Anchor) continue;
updateDrawableAnchor(drawable, closestAnchor);
} }
return true; return true;
} }
private static void checkAndApplyClosestAnchor(ISkinnableDrawable item)
{
if (item.UsesFixedAnchor) return;
var drawable = (Drawable)item;
var closestAnchor = getClosestAnchorForDrawable(drawable);
if (closestAnchor == drawable.Anchor) return;
updateDrawableAnchor(drawable, closestAnchor);
}
protected override void OnSelectionChanged() protected override void OnSelectionChanged()
{ {
base.OnSelectionChanged(); base.OnSelectionChanged();
@ -263,10 +271,8 @@ namespace osu.Game.Skinning.Editor
{ {
foreach (var item in SelectedItems) foreach (var item in SelectedItems)
{ {
var drawable = (Drawable)item;
item.UsesFixedAnchor = false; item.UsesFixedAnchor = false;
updateDrawableAnchor(drawable, getClosestAnchorForDrawable(drawable)); checkAndApplyClosestAnchor(item);
} }
} }