The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2024-11-23 01:39:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hold-repeat-macro-fix' of https://github.com/Gorgexpress/DS4Windows into jay

Browse Source
This commit is contained in:
Travis Nickles 2017-03-19 17:14:14 -07:00
commit 6a3e9ff913
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DS4Windows/DS4Control/ScpUtil.cs
View File

@ -803,7 +803,7 @@ namespace DS4Windows
keyType += DS4KeyType.Unbound; keyType += DS4KeyType.Unbound;
if (dcs.keyType.HasFlag(DS4KeyType.HoldMacro)) if (dcs.keyType.HasFlag(DS4KeyType.HoldMacro))
keyType += DS4KeyType.HoldMacro; keyType += DS4KeyType.HoldMacro;
if (dcs.keyType.HasFlag(DS4KeyType.Macro)) else if (dcs.keyType.HasFlag(DS4KeyType.Macro))
keyType += DS4KeyType.Macro; keyType += DS4KeyType.Macro;
if (dcs.keyType.HasFlag(DS4KeyType.Toggle)) if (dcs.keyType.HasFlag(DS4KeyType.Toggle))
keyType += DS4KeyType.Toggle; keyType += DS4KeyType.Toggle;

2
DS4Windows/DS4Forms/KBM360.cs
View File

@ -454,7 +454,7 @@ namespace DS4Windows
lBMacroOn.Visible = true; lBMacroOn.Visible = true;
foreach (int i in tag) foreach (int i in tag)
macrostag.Add(i); macrostag.Add(i);
if (Global.GetDS4KeyType(device, button.Name, rBShiftModifer.Checked).HasFlag(DS4KeyType.RepeatMacro)) if (Global.GetDS4KeyType(device, button.Name, rBShiftModifer.Checked).HasFlag(DS4KeyType.HoldMacro))
macrorepeat = true; macrorepeat = true;
} }
else if (tagO is string || tagO is X360Controls) else if (tagO is string || tagO is X360Controls)

2
DS4Windows/DS4Forms/Options.cs
View File

@ -1082,7 +1082,7 @@ namespace DS4Windows
if (SC) kt |= DS4KeyType.ScanCode; if (SC) kt |= DS4KeyType.ScanCode;
if (TG) kt |= DS4KeyType.Toggle; if (TG) kt |= DS4KeyType.Toggle;
if (MC) kt |= DS4KeyType.Macro; if (MC) kt |= DS4KeyType.Macro;
if (MR) kt |= DS4KeyType.RepeatMacro; if (MR) kt |= DS4KeyType.HoldMacro;
UpdateDS4CSetting(device, ctrl.Name, shift, tag.Key, tag.Value, kt, sTrigger); UpdateDS4CSetting(device, ctrl.Name, shift, tag.Key, tag.Value, kt, sTrigger);
} }

6
DS4Windows/DS4Forms/RecordBox.cs
View File

@ -784,8 +784,7 @@ namespace DS4Windows
kbm.macrostag = macros; kbm.macrostag = macros;
kbm.macros = macronames; kbm.macros = macronames;
kbm.lBMacroOn.Visible = true; kbm.lBMacroOn.Visible = true;
if (cBStyle.SelectedIndex == 1) kbm.macrorepeat = cBStyle.SelectedIndex == 1;
kbm.macrorepeat = true;
saved = true; saved = true;
if (sender != kbm) if (sender != kbm)
kbm.Close(); kbm.Close();
@ -796,8 +795,7 @@ namespace DS4Windows
sA.macros = macronames; sA.macros = macronames;
sA.lbMacroRecorded.Text = string.Join(", ", macronames); sA.lbMacroRecorded.Text = string.Join(", ", macronames);
//kbm.lBMacroOn.Visible = true; //kbm.lBMacroOn.Visible = true;
if (cBStyle.SelectedIndex == 1) sA.macrorepeat = cBStyle.SelectedIndex == 1;
sA.macrorepeat = true;
saved = true; saved = true;
//if (sender != sA) //if (sender != sA)
// sA.Close(); // sA.Close();