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

Merge branch 'jay' into vigem-udpserver

Browse Source
This commit is contained in:
Travis Nickles 2018-08-03 01:48:27 -05:00
commit 24403394ad
3 changed files with 66 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DS4Windows/DS4Control/X360Device.cs
View File

@ -24,6 +24,8 @@ namespace DS4Windows
} }
protected Int32 Scale(Int32 Value, Boolean Flip) protected Int32 Scale(Int32 Value, Boolean Flip)
{
unchecked
{ {
Value -= 0x80; Value -= 0x80;
@ -33,6 +35,7 @@ namespace DS4Windows
return (Int32)(temp * outputResolution + (-32768)); return (Int32)(temp * outputResolution + (-32768));
} }
}
public X360Device() public X360Device()
@ -113,6 +116,8 @@ namespace DS4Windows
Output[i] = 0; Output[i] = 0;
} }
unchecked
{
if (state.Share) Output[10] |= (Byte)(1 << 5); // Back if (state.Share) Output[10] |= (Byte)(1 << 5); // Back
if (state.L3) Output[10] |= (Byte)(1 << 6); // Left Thumb if (state.L3) Output[10] |= (Byte)(1 << 6); // Left Thumb
if (state.R3) Output[10] |= (Byte)(1 << 7); // Right Thumb if (state.R3) Output[10] |= (Byte)(1 << 7); // Right Thumb
@ -149,6 +154,7 @@ namespace DS4Windows
Output[20] = (Byte)((ThumbRY >> 0) & 0xFF); // RY Output[20] = (Byte)((ThumbRY >> 0) & 0xFF); // RY
Output[21] = (Byte)((ThumbRY >> 8) & 0xFF); Output[21] = (Byte)((ThumbRY >> 8) & 0xFF);
} }
}
public Boolean Plugin(Int32 Serial) public Boolean Plugin(Int32 Serial)
{ {

25
DS4Windows/DS4Forms/DS4Form.cs
View File

@ -409,13 +409,28 @@ namespace DS4Windows
foreach (Control control in fLPSettings.Controls) foreach (Control control in fLPSettings.Controls)
{ {
string tempst;
if (control.HasChildren) if (control.HasChildren)
{ {
foreach (Control ctrl in control.Controls) foreach (Control ctrl in control.Controls)
{
if (hoverTextDict.TryGetValue(ctrl, out tempst))
{
ctrl.MouseHover += Items_MouseHover; ctrl.MouseHover += Items_MouseHover;
} }
else
control.MouseHover += Items_MouseHover; {
ctrl.MouseHover += ClearLastMessage;
}
}
}
else
{
if (hoverTextDict.TryGetValue(control, out tempst))
control.MouseEnter += Items_MouseHover;
else
control.MouseHover += ClearLastMessage;
}
} }
} }
@ -447,6 +462,12 @@ namespace DS4Windows
g.DrawImage(shield, new Rectangle(0, 0, finalWidth, finalHeight)); g.DrawImage(shield, new Rectangle(0, 0, finalWidth, finalHeight));
} }
private void ClearLastMessage(object sender, EventArgs e)
{
lbLastMessage.Text = "";
lbLastMessage.ForeColor = SystemColors.GrayText;
}
private void blankControllerTab() private void blankControllerTab()
{ {
for (int Index = 0, PadsLen = Pads.Length; for (int Index = 0, PadsLen = Pads.Length;

4
DS4Windows/Properties/AssemblyInfo.cs
View File

@ -33,7 +33,7 @@ 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.5.1")] [assembly: AssemblyVersion("1.5.2")]
[assembly: AssemblyFileVersion("1.5.1")] [assembly: AssemblyFileVersion("1.5.2")]
[assembly: NeutralResourcesLanguage("en")] [assembly: NeutralResourcesLanguage("en")]