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

Merge branch 'jay' into udpserver

Browse Source
This commit is contained in:
Travis Nickles 2018-07-29 10:59:02 -05:00
commit 0f6eaed317
7 changed files with 1039 additions and 3616 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
DS4Windows/DS4Control/Mapping.cs
View File

@ -779,28 +779,28 @@ namespace DS4Windows
if (absX <= 0.4)
{
outputX = 0.45 * absX;
outputX = 0.46 * absX;
}
else if (absX <= 0.75)
{
outputX = absX - 0.22;
outputX = absX - 0.216;
}
else if (absX > 0.75)
{
outputX = (absX * 1.88) - 0.88;
outputX = (absX * 1.8634) - 0.8634;
}
if (absY <= 0.4)
{
outputY = 0.45 * absY;
outputY = 0.46 * absY;
}
else if (absY <= 0.75)
{
outputY = absY - 0.22;
outputY = absY - 0.216;
}
else if (absY > 0.75)
{
outputY = (absY * 1.88) - 0.88;
outputY = (absY * 1.8634) - 0.8634;
}
dState.LX = (byte)(outputX * signX * 127.5 + 127.5);
@ -839,28 +839,28 @@ namespace DS4Windows
if (absX <= 0.4)
{
outputX = 0.45 * absX;
outputX = 0.46 * absX;
}
else if (absX <= 0.75)
{
outputX = absX - 0.22;
outputX = absX - 0.216;
}
else if (absX > 0.75)
{
outputX = (absX * 1.88) - 0.88;
outputX = (absX * 1.8634) - 0.8634;
}
if (absY <= 0.4)
{
outputY = 0.45 * absY;
outputY = 0.46 * absY;
}
else if (absY <= 0.75)
{
outputY = absY - 0.22;
outputY = absY - 0.216;
}
else if (absY > 0.75)
{
outputY = (absY * 1.88) - 0.88;
outputY = (absY * 1.8634) - 0.8634;
}
dState.RX = (byte)(outputX * signX * 127.5 + 127.5);

5
DS4Windows/DS4Forms/DS4Form.cs
View File

@ -1462,6 +1462,7 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
opt.TopLevel = false;
opt.Dock = DockStyle.Fill;
opt.FormBorderStyle = FormBorderStyle.None;
tabProfiles.Controls.Add(opt);
optPop = true;
//opt.Dock = DockStyle.Fill;
@ -1479,9 +1480,12 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
}
opt.Reload(devID, profile);
opt.inputtimer.Start();
opt.Visible = true;
tabMain.SelectedIndex = 1;
opt.SetFlowAutoScroll();
}
public void OptionsClosed()
@ -1510,7 +1514,6 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
opt.sixaxisTimer.Stop();
opt.Dock = DockStyle.None;
tabProfiles.Controls.Remove(opt);
opt.Dispose();
optPop = false;
lBProfiles.Visible = true;

1
DS4Windows/DS4Forms/Options.Designer.cs generated
View File

@ -4117,7 +4117,6 @@
this.MinimizeBox = false;
this.Name = "Options";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Options_FormClosing);
this.Resize += new System.EventHandler(this.Options_Resize);
((System.ComponentModel.ISupportInitialize)(this.nUDRainbow)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tBBlueBar)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tBGreenBar)).EndInit();

12
DS4Windows/DS4Forms/Options.cs
View File

@ -142,6 +142,12 @@ namespace DS4Windows
populateHoverLabelDict();
}
public void SetFlowAutoScroll()
{
fLPSettings.AutoScroll = false;
fLPSettings.AutoScroll = true;
}
private void populateHoverIndexDict()
{
hoverIndexDict.Clear();
@ -2987,12 +2993,6 @@ namespace DS4Windows
e.Graphics.DrawImage(btnLightBgImg, new Rectangle(0, -1, Convert.ToInt32(btnLightbar.Width), Convert.ToInt32(btnLightbar.Height - 2)));
}
private void Options_Resize(object sender, EventArgs e)
{
fLPSettings.AutoScroll = false;
fLPSettings.AutoScroll = true;
}
private void lBControls_SelectedIndexChanged(object sender, EventArgs e)
{
int controlSelectedIndex = lBControls.SelectedIndex;

4608
DS4Windows/DS4Forms/Options.resx
View File

File diff suppressed because it is too large Load Diff

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
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.5.0")]
[assembly: AssemblyFileVersion("1.5.0")]
[assembly: AssemblyVersion("1.5.1")]
[assembly: AssemblyFileVersion("1.5.1")]
[assembly: NeutralResourcesLanguage("en")]

1
DS4Windows/app.config
View File

@ -7,5 +7,6 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<probing privatePath="Lang"/>
</assemblyBinding>
<gcServer enabled="true" />
</runtime>
</configuration>