From e341611fffac3fd3bf1441faba45c28e4cf03d9d Mon Sep 17 00:00:00 2001 From: MikiraSora Date: Tue, 29 Oct 2024 15:35:20 +0800 Subject: [PATCH] use MoveObjectTo() when adding curve control object --- .../DropActions/AddLaneCurvePathControlDropAction.cs | 5 +---- .../FumenVisualEditorViewModel.UserInteractionActions.cs | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/OngekiFumenEditor/Modules/FumenObjectPropertyBrowser/ViewModels/DropActions/AddLaneCurvePathControlDropAction.cs b/OngekiFumenEditor/Modules/FumenObjectPropertyBrowser/ViewModels/DropActions/AddLaneCurvePathControlDropAction.cs index ed2a9668..a27d1701 100644 --- a/OngekiFumenEditor/Modules/FumenObjectPropertyBrowser/ViewModels/DropActions/AddLaneCurvePathControlDropAction.cs +++ b/OngekiFumenEditor/Modules/FumenObjectPropertyBrowser/ViewModels/DropActions/AddLaneCurvePathControlDropAction.cs @@ -25,15 +25,12 @@ public void Drop(FumenVisualEditorViewModel editor, Point dragEndPoint) if (!editor.CheckAndNotifyIfPlaceBeyondDuration(dragEndPoint)) return; - var dragTGrid = TGridCalculator.ConvertYToTGrid_DesignMode(dragEndPoint.Y, editor); - var dragXGrid = XGridCalculator.ConvertXToXGrid(dragEndPoint.X, editor); var isFirst = true; editor.UndoRedoManager.ExecuteAction(LambdaUndoAction.Create(Resources.AddCurveControlPoint, () => { - cachePathControl.TGrid = dragTGrid; - cachePathControl.XGrid = dragXGrid; curveObject.AddControlObject(cachePathControl); + editor.MoveObjectTo(cachePathControl, dragEndPoint); if (isFirst) { editor.NotifyObjectClicked(cachePathControl); diff --git a/OngekiFumenEditor/Modules/FumenVisualEditor/ViewModels/FumenVisualEditorViewModel.UserInteractionActions.cs b/OngekiFumenEditor/Modules/FumenVisualEditor/ViewModels/FumenVisualEditorViewModel.UserInteractionActions.cs index 1a07221f..ef37d32b 100644 --- a/OngekiFumenEditor/Modules/FumenVisualEditor/ViewModels/FumenVisualEditorViewModel.UserInteractionActions.cs +++ b/OngekiFumenEditor/Modules/FumenVisualEditor/ViewModels/FumenVisualEditorViewModel.UserInteractionActions.cs @@ -886,15 +886,12 @@ private void ProcessAsAddCurve(ConnectableChildObjectBase child, Point position) return; var curvePoint = new LaneCurvePathControlObject(); - var dragTGrid = TGridCalculator.ConvertYToTGrid_DesignMode(position.Y, this); - var dragXGrid = XGridCalculator.ConvertXToXGrid(position.X, this); var isFirst = true; UndoRedoManager.ExecuteAction(LambdaUndoAction.Create(Resources.AddCurveControlPoint, () => { - curvePoint.TGrid = dragTGrid; - curvePoint.XGrid = dragXGrid; child.AddControlObject(curvePoint); + MoveObjectTo(curvePoint, position); if (isFirst) { NotifyObjectClicked(curvePoint);