Code cleanup

NyagekiFumenProject · Oct 28, 2024 · 8000550 · 8000550
1 parent 612160e
commit 8000550
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 36 deletions.
diff --git a/OngekiFumenEditor/Modules/FumenVisualEditor/Behaviors/BatchMode/BatchModeBehavior.cs b/OngekiFumenEditor/Modules/FumenVisualEditor/Behaviors/BatchMode/BatchModeBehavior.cs
@@ -50,8 +50,7 @@ public class BatchModeBehavior : Behavior<FumenVisualEditorView>
         new Dictionary<string, Func<BatchModeBehavior, TriggerAction>>()
         {
             ["PreviewMouseDown"] = b => new LambdaTriggerAction(o => { b.MouseDown((MouseButtonEventArgs)o); }),
-            ["PreviewMouseUp"] = b => new LambdaTriggerAction(o => { b.MouseUp((MouseButtonEventArgs)o); }),
-            ["MouseMove"] = b => new LambdaTriggerAction(o => { b.MouseMove((MouseEventArgs)o);})
+            ["PreviewMouseUp"] = b => new LambdaTriggerAction(o => { b.MouseUp((MouseButtonEventArgs)o); })
         }.ToImmutableDictionary();
 
     public BatchModeSubmode CurrentSubmode
@@ -64,36 +63,36 @@ public BatchModeSubmode CurrentSubmode
     private readonly List<TriggerBase> OldKeyTriggers = new();
     private readonly List<TriggerBase> NewKeyTriggers = new();
 
-    private readonly IFumenEditorClipboard Clipboard;
-
     public BatchModeBehavior()
     {
-        Clipboard = IoC.Get<IFumenEditorClipboard>();
     }
 
     protected override void OnAttached()
     {
         if (AssociatedObject.DataContext is not FumenVisualEditorViewModel editor)
             return;
 
-        var triggerCollection = Interaction.GetTriggers(AssociatedObject);
+        var editorTriggers = Interaction.GetTriggers(AssociatedObject);
 
         // Create brush key triggers on the FumenVisualEditorView.
-        // Temporarily delete existing ones that clash with brush keys. 
-        foreach (var (key, submodeType) in CommandDefinitions) {
-            var existingTriggers = triggerCollection.Where(t =>
-                t is ActionMessageKeyBinding am && am.Definition.Key == key.Key &&
-                am.Definition.Modifiers == key.Modifiers);
+        // Temporarily delete existing ones that clash with brush keys.
+        var allCommands = CommandDefinitions.SelectMany
+            <KeyValuePair<KeyBindingDefinition, BatchModeSubmode>, ((Key, ModifierKeys), BatchModeSubmode)>(kv =>
+            [
+                ((kv.Key.Key, kv.Key.Modifiers), kv.Value),
+                ((kv.Key.Key, kv.Key.Modifiers | ModifierKeys.Shift), kv.Value)
+            ]);
+
+        foreach (var ((key, modifiers), submodeType) in allCommands) {
+            var existingTriggers = editorTriggers.Where(t =>
+                t is ActionMessageKeyBinding am && am.Definition.Key == key && am.Definition.Modifiers == modifiers);
             OldKeyTriggers.AddRange(existingTriggers);
-            OldKeyTriggers.ForEach(t => triggerCollection.Remove(t));
-
-            foreach (var mod in new[] { ModifierKeys.None, ModifierKeys.Shift }) {
-                // It's useful to hold down shift as we place multiple lanes, so bind everything to Shift+ as well.
-                var newTrigger = new KeyTrigger() { Key = key.Key, Modifiers = mod };
-                newTrigger.Actions.Add(new LambdaTriggerAction(_ => ApplySubmode(submodeType)));
-                triggerCollection.Add(newTrigger);
-                NewKeyTriggers.Add(newTrigger);
-            }
+            OldKeyTriggers.ForEach(t => editorTriggers.Remove(t));
+
+            var newTrigger = new KeyTrigger() { Key = key, Modifiers = modifiers };
+            newTrigger.Actions.Add(new LambdaTriggerAction(_ => ApplySubmode(submodeType)));
+            editorTriggers.Add(newTrigger);
+            NewKeyTriggers.Add(newTrigger);
         }
 
         // Add mouse click events directly on the GlView.
@@ -139,10 +138,6 @@ protected override void OnDetaching()
         GeneratedClickTriggerActions.Clear();
 
         AssociatedObject.KeyDown -= ConsumeAlt;
-
-        if (AssociatedObject.DataContext is FumenVisualEditorViewModel edtior) {
-            edtior.SelectRegionType = SelectRegionType.Select;
-        }
     }
 
     private void ApplySubmode(BatchModeSubmode submode)
@@ -155,16 +150,6 @@ private void ApplySubmode(BatchModeSubmode submode)
     private bool lastLeftClickWasAltClick = false;
     private bool lastRightClickWasAltClick = false;
 
-    private void MouseMove(MouseEventArgs args)
-    {
-        if (Mouse.LeftButton != MouseButtonState.Pressed && Mouse.RightButton != MouseButtonState.Pressed)
-            return;
-        if (CurrentSubmode is null)
-            return;
-        if (AssociatedObject.DataContext is not FumenVisualEditorViewModel editor)
-            return;
-    }
-
     private void MouseDown(MouseButtonEventArgs args)
     {
         if (AssociatedObject.DataContext is not FumenVisualEditorViewModel editor)

diff --git a/OngekiFumenEditor/Modules/FumenVisualEditor/ViewModels/FumenVisualEditorViewModel.cs b/OngekiFumenEditor/Modules/FumenVisualEditor/ViewModels/FumenVisualEditorViewModel.cs
@@ -172,8 +172,6 @@ public bool IsBatchMode
 
         public EditorSetting Setting { get; } = new EditorSetting();
 
-        public SelectRegionType SelectRegionType = SelectRegionType.Select;
-
         public FumenVisualEditorViewModel() : base()
         {
             //replace owned impl