From 551acd8c9ee57a005c4dc4e4331ce7f4e61e4a54 Mon Sep 17 00:00:00 2001 From: feos Date: Thu, 6 Aug 2015 20:24:56 +0300 Subject: [PATCH] tastudio: shift is occupied, alt is not. use alt for marker drag! the need to draw selection in patterns is too weak, so we can safely leave alt-clicks and alt-draws to input columns only (when it's implemented). --- BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs | 3 ++- BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs index 42fc10fd36..ef78351680 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs @@ -1624,7 +1624,8 @@ namespace BizHawk.Client.EmuHawk { if (ModifierKeys == Keys.Alt) { - MessageBox.Show("Alt click logic is not yet implemented"); + // MessageBox.Show("Alt click logic is not yet implemented"); + // do marker drag here } else if (ModifierKeys == Keys.Shift) { diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs index 9a95c4565c..7495e3a98d 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs @@ -363,7 +363,7 @@ namespace BizHawk.Client.EmuHawk } else if (TasView.CurrentCell.Column.Name == FrameColumnName) { - if (Control.ModifierKeys == Keys.Shift && CurrentTasMovie.Markers.IsMarker(frame)) + if (Control.ModifierKeys == Keys.Alt && CurrentTasMovie.Markers.IsMarker(frame)) { // TODO TasView.DragCurrentCell();