ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tastudio: make analog hotkeys working, and their names fit in

This commit is contained in:
feos 2016-11-21 18:00:21 +03:00
parent 95dc2fd6b3
commit 05d47a7318
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BizHawk.Client.Common/config/Binding.cs
View File

@ -229,10 +229,10 @@ namespace BizHawk.Client.Common
Bind("TAStudio", "Insert Frame", "Insert"),
Bind("TAStudio", "Delete Frames", "Ctrl+Delete"),
Bind("TAStudio", "Clone Frames", "Ctrl+Insert"),
Bind("TAStudio", "Analog Increment By One", "UpArrow"),
Bind("TAStudio", "Analog Decrement By One", "DownArrow"),
Bind("TAStudio", "Analog Increment By Ten", "Shift+UpArrow"),
Bind("TAStudio", "Analog Decrement By Ten", "Shift+DownArrow"),
Bind("TAStudio", "Analog Increment", "UpArrow"),
Bind("TAStudio", "Analog Decrement", "DownArrow"),
Bind("TAStudio", "Analog Incr. by 10", "Shift+UpArrow"),
Bind("TAStudio", "Analog Decr. by 10", "Shift+DownArrow"),
Bind("TAStudio", "Analog Maximum", "RightArrow"),
Bind("TAStudio", "Analog Minimum", "LeftArrow"),

8
BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
View File

@ -397,19 +397,19 @@ namespace BizHawk.Client.EmuHawk
if (GlobalWin.Tools.IsLoaded<TAStudio>())
GlobalWin.Tools.TAStudio.CloneFramesExternal();
break;
case "Analog Increment By One":
case "Analog Increment":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
GlobalWin.Tools.TAStudio.AnalogIncrementByOne();
break;
case "Analog Decrement By One":
case "Analog Decrement":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
GlobalWin.Tools.TAStudio.AnalogDecrementByOne();
break;
case "Analog Increment By Ten":
case "Analog Incr. by 10":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
GlobalWin.Tools.TAStudio.AnalogIncrementByTen();
break;
case "Analog Decrement By Ten":
case "Analog Decr. by 10":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
GlobalWin.Tools.TAStudio.AnalogDecrementByTen();
break;

2
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -695,7 +695,7 @@ namespace BizHawk.Client.EmuHawk
{
if(yield_alt) return false;
var ts = ActiveForm as TAStudio;
if(ts.IsInMenuLoop || ts.FloatEditingMode)
if(ts.IsInMenuLoop)
return false;
}