The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2025-02-13 06:39:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor edits

Browse Source
This commit is contained in:
Travis Nickles 2017-05-02 08:00:54 -07:00
parent 272eba4432
commit 1876d0a3a3
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
DS4Windows/DS4Forms/Options.cs
View File

@ -128,8 +128,6 @@ namespace DS4Windows
public void Reload(int deviceNum, string name) public void Reload(int deviceNum, string name)
{ {
nUDRumbleBoost.ValueChanged -= rumbleBoostBar_ValueChanged;
loading = true; loading = true;
device = deviceNum; device = deviceNum;
filename = name; filename = name;
@ -508,11 +506,10 @@ namespace DS4Windows
LoadActions(string.IsNullOrEmpty(filename)); LoadActions(string.IsNullOrEmpty(filename));
loading = false; loading = false;
saving = false; saving = false;
nUDRumbleBoost.ValueChanged += new EventHandler(this.rumbleBoostBar_ValueChanged);
} }
private string getDS4ControlsByName(DS4Controls key) /* TODO: Possibly remove. Currently not used. */
/*private string getDS4ControlsByName(DS4Controls key)
{ {
switch (key) switch (key)
{ {
@ -562,6 +559,7 @@ namespace DS4Windows
return ""; return "";
} }
*/
public void LoadActions(bool newp) public void LoadActions(bool newp)
{ {
@ -813,6 +811,7 @@ namespace DS4Windows
{ {
switch (Program.rootHub.GetInputkeys((int)nUDSixaxis.Value - 1)) switch (Program.rootHub.GetInputkeys((int)nUDSixaxis.Value - 1))
{ {
case ("nothing"): break;
case ("Cross"): Show_ControlsBn(bnCross, e); break; case ("Cross"): Show_ControlsBn(bnCross, e); break;
case ("Circle"): Show_ControlsBn(bnCircle, e); break; case ("Circle"): Show_ControlsBn(bnCircle, e); break;
case ("Square"): Show_ControlsBn(bnSquare, e); break; case ("Square"): Show_ControlsBn(bnSquare, e); break;
@ -846,6 +845,7 @@ namespace DS4Windows
case ("GyroXN"): Show_ControlsBn(bnGyroXN, e); break; case ("GyroXN"): Show_ControlsBn(bnGyroXN, e); break;
case ("GyroZP"): Show_ControlsBn(bnGyroZP, e); break; case ("GyroZP"): Show_ControlsBn(bnGyroZP, e); break;
case ("GyroZN"): Show_ControlsBn(bnGyroZN, e); break; case ("GyroZN"): Show_ControlsBn(bnGyroZN, e); break;
default: break;
} }
} }
} }
@ -1387,6 +1387,8 @@ namespace DS4Windows
return Color.FromArgb((int)((R + m) * 255), (int)((G + m) * 255), (int)((B + m) * 255)); return Color.FromArgb((int)((R + m) * 255), (int)((G + m) * 255), (int)((B + m) * 255));
} }
private void rumbleBoostBar_ValueChanged(object sender, EventArgs e) private void rumbleBoostBar_ValueChanged(object sender, EventArgs e)
{
if (!loading)
{ {
RumbleBoost[device] = (byte)nUDRumbleBoost.Value; RumbleBoost[device] = (byte)nUDRumbleBoost.Value;
byte h = (byte)Math.Min(255, (255 * nUDRumbleBoost.Value / 100)); byte h = (byte)Math.Min(255, (255 * nUDRumbleBoost.Value / 100));
@ -1395,6 +1397,7 @@ namespace DS4Windows
bool lB = btnRumbleLightTest.Text == Properties.Resources.TestLText; bool lB = btnRumbleLightTest.Text == Properties.Resources.TestLText;
Program.rootHub.setRumble((byte)(hB ? h : 0), (byte)(lB ? l : 0), device); Program.rootHub.setRumble((byte)(hB ? h : 0), (byte)(lB ? l : 0), device);
} }
}
private void btnRumbleHeavyTest_Click(object sender, EventArgs e) private void btnRumbleHeavyTest_Click(object sender, EventArgs e)
{ {
@ -2179,7 +2182,6 @@ namespace DS4Windows
Toggle_Bn(scancode, false, false, false, button4); Toggle_Bn(scancode, false, false, false, button4);
}*/ }*/
private void SetPreset(object sender, EventArgs e) private void SetPreset(object sender, EventArgs e)
{ {
bool scancode = false; bool scancode = false;
@ -2538,8 +2540,10 @@ namespace DS4Windows
{ {
List<string> pactions = new List<string>(); List<string> pactions = new List<string>();
foreach (ListViewItem lvi in lVActions.Items) foreach (ListViewItem lvi in lVActions.Items)
{
if (lvi != null && lvi.Checked) if (lvi != null && lvi.Checked)
pactions.Add(lvi.Text); pactions.Add(lvi.Text);
}
ProfileActions[device] = pactions; ProfileActions[device] = pactions;
calculateProfileActionCount(device); calculateProfileActionCount(device);