Version 1.4.0.76

When using default controls, fix no controls working
When using custom controls, fix sticks not working
Hopefully removed DS4W from alt+tab menu when minimized
This commit is contained in:
jays2kings 2014-10-21 14:31:36 -04:00
parent ebea6d05dd
commit ab72a2956b
4 changed files with 11 additions and 11 deletions

View File

@ -409,13 +409,13 @@ namespace DS4Control
if (Global.getHasCustomKeysorButtons(ind)) if (Global.getHasCustomKeysorButtons(ind))
{ {
Mapping.MapCustom(ind, cState, MappedState[ind], ExposedState[ind]); Mapping.MapCustom(ind, cState, MappedState[ind], ExposedState[ind]);
//cState = MappedState[ind]; cState = MappedState[ind];
} }
// Update the GUI/whatever. // Update the GUI/whatever.
DS4LightBar.updateLightBar(device, ind, MappedState[ind], ExposedState[ind]); DS4LightBar.updateLightBar(device, ind, cState, ExposedState[ind]);
x360Bus.Parse(MappedState[ind], processingData[ind].Report, ind); x360Bus.Parse(cState, processingData[ind].Report, ind);
// We push the translated Xinput state, and simultaneously we // We push the translated Xinput state, and simultaneously we
// pull back any possible rumble data coming from Xinput consumers. // pull back any possible rumble data coming from Xinput consumers.
if (x360Bus.Report(processingData[ind].Report, processingData[ind].Rumble)) if (x360Bus.Report(processingData[ind].Report, processingData[ind].Rumble))

View File

@ -720,25 +720,25 @@ namespace DS4Control
if (getXYAxisMapping(device, dc, cState, eState) != 127) if (getXYAxisMapping(device, dc, cState, eState) != 127)
MappedState.LX = getXYAxisMapping(device, dc, cState, eState); MappedState.LX = getXYAxisMapping(device, dc, cState, eState);
foreach (DS4Controls dc in LXP) foreach (DS4Controls dc in LXP)
if (getXYAxisMapping(device, dc, cState, eState) != 127) if (getXYAxisMapping(device, dc, cState, eState, true) != 127)
MappedState.LX = getXYAxisMapping(device, dc, cState, eState, true); MappedState.LX = getXYAxisMapping(device, dc, cState, eState, true);
foreach (DS4Controls dc in LYN) foreach (DS4Controls dc in LYN)
if (getXYAxisMapping(device, dc, cState, eState) != 127) if (getXYAxisMapping(device, dc, cState, eState) != 127)
MappedState.LY = getXYAxisMapping(device, dc, cState, eState); MappedState.LY = getXYAxisMapping(device, dc, cState, eState);
foreach (DS4Controls dc in LYP) foreach (DS4Controls dc in LYP)
if (getXYAxisMapping(device, dc, cState, eState) != 127) if (getXYAxisMapping(device, dc, cState, eState, true) != 127)
MappedState.LY = getXYAxisMapping(device, dc, cState, eState, true); MappedState.LY = getXYAxisMapping(device, dc, cState, eState, true);
foreach (DS4Controls dc in RXN) foreach (DS4Controls dc in RXN)
if (getXYAxisMapping(device, dc, cState, eState) != 127) if (getXYAxisMapping(device, dc, cState, eState) != 127)
MappedState.RX = getXYAxisMapping(device, dc, cState, eState); MappedState.RX = getXYAxisMapping(device, dc, cState, eState);
foreach (DS4Controls dc in RXP) foreach (DS4Controls dc in RXP)
if (getXYAxisMapping(device, dc, cState, eState) != 127) if (getXYAxisMapping(device, dc, cState, eState, true) != 127)
MappedState.RX = getXYAxisMapping(device, dc, cState, eState, true); MappedState.RX = getXYAxisMapping(device, dc, cState, eState, true);
foreach (DS4Controls dc in RYN) foreach (DS4Controls dc in RYN)
if (getXYAxisMapping(device, dc, cState, eState) != 127) if (getXYAxisMapping(device, dc, cState, eState) != 127)
MappedState.RY = getXYAxisMapping(device, dc, cState, eState); MappedState.RY = getXYAxisMapping(device, dc, cState, eState);
foreach (DS4Controls dc in RYP) foreach (DS4Controls dc in RYP)
if (getXYAxisMapping(device, dc, cState, eState) != 127) if (getXYAxisMapping(device, dc, cState, eState, true) != 127)
MappedState.RY = getXYAxisMapping(device, dc, cState, eState, true); MappedState.RY = getXYAxisMapping(device, dc, cState, eState, true);
InputMethods.MoveCursorBy(MouseDeltaX, MouseDeltaY); InputMethods.MoveCursorBy(MouseDeltaX, MouseDeltaY);
} }

View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.4.0.75")] [assembly: AssemblyVersion("1.4.0.76")]
[assembly: AssemblyFileVersion("1.4.0.75")] [assembly: AssemblyFileVersion("1.4.0.76")]

View File

@ -554,14 +554,14 @@ namespace ScpServer
{ {
this.Hide(); this.Hide();
this.ShowInTaskbar = false; this.ShowInTaskbar = false;
//this.FormBorderStyle = FormBorderStyle.SizableToolWindow; this.FormBorderStyle = FormBorderStyle.None;
} }
else if (FormWindowState.Normal == this.WindowState) else if (FormWindowState.Normal == this.WindowState)
{ {
this.Show(); this.Show();
this.ShowInTaskbar = true; this.ShowInTaskbar = true;
//this.FormBorderStyle = FormBorderStyle.Sizable; this.FormBorderStyle = FormBorderStyle.Sizable;
} }
chData.AutoResize(ColumnHeaderAutoResizeStyle.HeaderSize); chData.AutoResize(ColumnHeaderAutoResizeStyle.HeaderSize);
} }