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
israfilistek · Oct 21, 2014 · ab72a29 · ab72a29
1 parent ebea6d0
commit ab72a29
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/DS4Control/Control.cs b/DS4Control/Control.cs
@@ -409,13 +409,13 @@ protected virtual void On_Report(object sender, EventArgs e)
                 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
@@ -720,25 +720,25 @@ public static async void MapCustom(int device, DS4State cState, DS4State MappedS
                 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
@@ -32,5 +32,5 @@
 // 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
@@ -554,14 +554,14 @@ protected void Form_Resize(object sender, EventArgs e)
             {
                 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);
         }