The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2025-02-02 18:12:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jay' of https://github.com/Ryochan7/DS4Windows into jay

Browse Source
This commit is contained in:
mika-n 2018-11-19 11:40:53 +02:00
commit 09c74e9979
4 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
DS4Windows/DS4Forms/DS4Form.cs
View File

@ -52,7 +52,6 @@ namespace DS4Windows
Options opt; Options opt;
private bool optPop; private bool optPop;
public Size oldsize; public Size oldsize;
public bool mAllowVisible;
bool contextclose; bool contextclose;
bool turnOffTemp; bool turnOffTemp;
bool runningBat; bool runningBat;
@ -235,13 +234,11 @@ namespace DS4Windows
break; break;
} }
if (!(startMinimizedCheckBox.Checked || mini)) if (startMinimizedCheckBox.Checked || mini)
{ {
mAllowVisible = true; WindowState = FormWindowState.Minimized;
Show();
} }
Form_Resize(null, null);
RefreshProfiles(); RefreshProfiles();
/*opt = new Options(this); /*opt = new Options(this);
opt.Icon = this.Icon; opt.Icon = this.Icon;
@ -392,13 +389,14 @@ namespace DS4Windows
else else
{ {
if (hoverTextDict.TryGetValue(control, out tempst)) if (hoverTextDict.TryGetValue(control, out tempst))
control.MouseEnter += Items_MouseHover; control.MouseHover += Items_MouseHover;
else else
control.MouseHover += ClearLastMessage; control.MouseHover += ClearLastMessage;
} }
} }
instance = this; instance = this;
Form_Resize(null, null);
if (btnStartStop.Enabled && start) if (btnStartStop.Enabled && start)
TaskRunner.Delay(50).ContinueWith((t) => this.BeginInvoke((System.Action)(() => BtnStartStop_Clicked()))); TaskRunner.Delay(50).ContinueWith((t) => this.BeginInvoke((System.Action)(() => BtnStartStop_Clicked())));
} }
@ -500,17 +498,6 @@ namespace DS4Windows
} }
} }
protected override void SetVisibleCore(bool value)
{
if (!mAllowVisible)
{
value = false;
if (!IsHandleCreated) CreateHandle();
}
base.SetVisibleCore(value);
}
public static string GetTopWindowName() public static string GetTopWindowName()
{ {
IntPtr hWnd = GetForegroundWindow(); IntPtr hWnd = GetForegroundWindow();
@ -1591,7 +1578,6 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
private void editMenu_Click(object sender, EventArgs e) private void editMenu_Click(object sender, EventArgs e)
{ {
mAllowVisible = true;
Show(); Show();
WindowState = FormWindowState.Normal; WindowState = FormWindowState.Normal;
ToolStripMenuItem em = (ToolStripMenuItem)sender; ToolStripMenuItem em = (ToolStripMenuItem)sender;
@ -1741,7 +1727,6 @@ Properties.Resources.DS4Update, MessageBoxButtons.YesNo, MessageBoxIcon.Question
private void openToolStripMenuItem_Click(object sender, EventArgs e) private void openToolStripMenuItem_Click(object sender, EventArgs e)
{ {
mAllowVisible = true;
Show(); Show();
Focus(); Focus();
WindowState = FormWindowState.Normal; WindowState = FormWindowState.Normal;

2
DS4Windows/DS4Library/DS4Devices.cs
View File

@ -104,7 +104,7 @@ namespace DS4Windows
startInfo.Arguments = "re-enabledevice " + devicePathToInstanceId(hDevice.DevicePath); startInfo.Arguments = "re-enabledevice " + devicePathToInstanceId(hDevice.DevicePath);
Process child = Process.Start(startInfo); Process child = Process.Start(startInfo);
if (!child.WaitForExit(15000)) if (!child.WaitForExit(30000))
{ {
child.Kill(); child.Kill();
} }

2
DS4Windows/Program.cs
View File

@ -103,7 +103,7 @@ namespace DS4Windows
//rootHub = new ControlService(); //rootHub = new ControlService();
Application.EnableVisualStyles(); Application.EnableVisualStyles();
ds4form = new DS4Form(args); ds4form = new DS4Form(args);
Application.Run(ds4form); Application.Run();
//mutex.ReleaseMutex(); //mutex.ReleaseMutex();
//} //}

2
DS4Windows/app.manifest
View File

@ -16,7 +16,7 @@
Remove this element if your application requires this virtualization for backwards Remove this element if your application requires this virtualization for backwards
compatibility. compatibility.
--> -->
<requestedExecutionLevel level="requireAdministrator" uiAccess="false" /> <requestedExecutionLevel level="asInvoker" uiAccess="false" />
</requestedPrivileges> </requestedPrivileges>
</security> </security>
</trustInfo> </trustInfo>