From ab72a2956bcc31a7c10056e1196d0faf6dc46599 Mon Sep 17 00:00:00 2001 From: jays2kings Date: Tue, 21 Oct 2014 14:31:36 -0400 Subject: [PATCH] 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 --- DS4Control/Control.cs | 6 +++--- DS4Control/Mapping.cs | 8 ++++---- DS4Tool/Properties/AssemblyInfo.cs | 4 ++-- DS4Tool/ScpForm.cs | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/DS4Control/Control.cs b/DS4Control/Control.cs index a944fb0..d389158 100644 --- a/DS4Control/Control.cs +++ b/DS4Control/Control.cs @@ -409,13 +409,13 @@ namespace DS4Control if (Global.getHasCustomKeysorButtons(ind)) { Mapping.MapCustom(ind, cState, MappedState[ind], ExposedState[ind]); - //cState = MappedState[ind]; + cState = MappedState[ind]; } // 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 // pull back any possible rumble data coming from Xinput consumers. if (x360Bus.Report(processingData[ind].Report, processingData[ind].Rumble)) diff --git a/DS4Control/Mapping.cs b/DS4Control/Mapping.cs index bc806ec..b7b6b91 100644 --- a/DS4Control/Mapping.cs +++ b/DS4Control/Mapping.cs @@ -720,25 +720,25 @@ namespace DS4Control if (getXYAxisMapping(device, dc, cState, eState) != 127) MappedState.LX = getXYAxisMapping(device, dc, cState, eState); 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); foreach (DS4Controls dc in LYN) if (getXYAxisMapping(device, dc, cState, eState) != 127) MappedState.LY = getXYAxisMapping(device, dc, cState, eState); 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); foreach (DS4Controls dc in RXN) if (getXYAxisMapping(device, dc, cState, eState) != 127) MappedState.RX = getXYAxisMapping(device, dc, cState, eState); 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); foreach (DS4Controls dc in RYN) if (getXYAxisMapping(device, dc, cState, eState) != 127) MappedState.RY = getXYAxisMapping(device, dc, cState, eState); 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); InputMethods.MoveCursorBy(MouseDeltaX, MouseDeltaY); } diff --git a/DS4Tool/Properties/AssemblyInfo.cs b/DS4Tool/Properties/AssemblyInfo.cs index 4906e62..3b19a64 100644 --- a/DS4Tool/Properties/AssemblyInfo.cs +++ b/DS4Tool/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.4.0.75")] -[assembly: AssemblyFileVersion("1.4.0.75")] +[assembly: AssemblyVersion("1.4.0.76")] +[assembly: AssemblyFileVersion("1.4.0.76")] diff --git a/DS4Tool/ScpForm.cs b/DS4Tool/ScpForm.cs index dd2bf37..d32573c 100644 --- a/DS4Tool/ScpForm.cs +++ b/DS4Tool/ScpForm.cs @@ -554,14 +554,14 @@ namespace ScpServer { this.Hide(); this.ShowInTaskbar = false; - //this.FormBorderStyle = FormBorderStyle.SizableToolWindow; + this.FormBorderStyle = FormBorderStyle.None; } else if (FormWindowState.Normal == this.WindowState) { this.Show(); this.ShowInTaskbar = true; - //this.FormBorderStyle = FormBorderStyle.Sizable; + this.FormBorderStyle = FormBorderStyle.Sizable; } chData.AutoResize(ColumnHeaderAutoResizeStyle.HeaderSize); }