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

Only have Options form loaded when needed.

Browse Source 
Might need to find a functional compromise later. Overall app
performance is improved but opening the Options form to edit
a profile takes a few seconds
This commit is contained in:
Travis Nickles 2017-12-06 06:49:23 -06:00
parent a1d15f5180
commit 9547da8180
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
DS4Windows/DS4Forms/DS4Form.cs
View File

@ -52,6 +52,7 @@ namespace DS4Windows
private bool systemShutdown = false;
private bool wasrunning = false;
Options opt;
private bool optPop;
public Size oldsize;
public bool mAllowVisible;
bool contextclose;
@ -297,12 +298,13 @@ namespace DS4Windows
Form_Resize(null, null);
RefreshProfiles();
opt = new Options(this);
/*opt = new Options(this);
opt.Icon = this.Icon;
opt.TopLevel = false;
opt.Dock = DockStyle.Fill;
opt.Dock = DockStyle.None;
opt.FormBorderStyle = FormBorderStyle.None;
tabProfiles.Controls.Add(opt);
*/
//tabProfiles.Controls.Add(opt);
autoProfilesTimer.Elapsed += CheckAutoProfiles;
autoProfilesTimer.Interval = 1000;
@ -1361,7 +1363,7 @@ namespace DS4Windows
private void lBProfiles_KeyDown(object sender, KeyEventArgs e)
{
if (lBProfiles.SelectedIndex >= 0 && !opt.Visible)
if (lBProfiles.SelectedIndex >= 0 && optPop && !opt.Visible)
{
if (e.KeyValue == 13)
ShowOptions(4, lBProfiles.SelectedItem.ToString());
@ -1488,8 +1490,16 @@ namespace DS4Windows
else
tSTBProfile.Text = "<" + Properties.Resources.TypeProfileName + ">";
lBProfiles.SendToBack();
toolStrip1.SendToBack();
opt = new Options(this);
opt.Icon = this.Icon;
opt.TopLevel = false;
opt.Dock = DockStyle.Fill;
opt.FormBorderStyle = FormBorderStyle.None;
tabProfiles.Controls.Add(opt);
optPop = true;
//opt.Dock = DockStyle.Fill;
//lBProfiles.SendToBack();
//toolStrip1.SendToBack();
tSOptions.SendToBack();
opt.BringToFront();
oldsize = Size;
@ -1531,6 +1541,10 @@ namespace DS4Windows
opt.inputtimer.Stop();
opt.sixaxisTimer.Stop();
opt.Dock = DockStyle.None;
tabProfiles.Controls.Remove(opt);
opt.Dispose();
optPop = false;
lBProfiles.Visible = true;
}
@ -1930,13 +1944,13 @@ namespace DS4Windows
private void tSBCancel_Click(object sender, EventArgs e)
{
if (opt.Visible)
if (optPop && opt.Visible)
opt.Close();
}
private void tSBSaveProfile_Click(object sender, EventArgs e)
{
if (opt.Visible)
if (optPop && opt.Visible)
{
opt.saving = true;
opt.Set();
@ -2115,7 +2129,7 @@ namespace DS4Windows
bool tempBool = false;
protected void ScpForm_Closing(object sender, FormClosingEventArgs e)
{
if (opt.Visible)
if (opt != null && opt.Visible)
{
opt.Close();
e.Cancel = true;

1
DS4Windows/DS4Forms/Options.cs
View File

@ -125,6 +125,7 @@ namespace DS4Windows
inputtimer.Tick += InputDS4;
sixaxisTimer.Tick += ControllerReadout_Tick;
sixaxisTimer.Interval = 1000 / 60;
bnGyroZN.Text = Properties.Resources.TiltUp;
bnGyroZP.Text = Properties.Resources.TiltDown;
bnGyroXP.Text = Properties.Resources.TiltLeft;