ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Disable Tool Box on Linux (fixes #2741)" 

This reverts commit fe6bf7ba12.
This commit is contained in:
YoshiRulz 2021-09-30 19:43:38 +10:00
parent dc090b81fe
commit 078852567a
3 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
View File

@ -1,7 +1,5 @@
using System;
using System.Linq;
using BizHawk.Common;
using BizHawk.Emulation.Common;
using BizHawk.Emulation.Cores.Consoles.Nintendo.NDS;
using BizHawk.Emulation.Cores.Nintendo.Gameboy;
@ -351,7 +349,7 @@ namespace BizHawk.Client.EmuHawk
Tools.Load<TAStudio>();
break;
case "ToolBox":
if (!OSTailoredCode.IsUnixHost) Tools.Load<ToolBox>();
Tools.Load<ToolBox>();
break;
case "Virtual Pad":
Tools.Load<VirtualpadTool>();

6
src/BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -354,12 +354,6 @@ namespace BizHawk.Client.EmuHawk
#else
SynclessRecordingMenuItem.Enabled = false;
#endif
if (OSTailoredCode.IsUnixHost)
{
ToolBoxMenuItem.Enabled = false;
ToolBoxMenuItem.Visible = false;
toolStripSeparator12.Visible = false;
}
Game = GameInfo.NullInstance;
_throttle = new Throttle();

6
src/BizHawk.Client.EmuHawk/tools/ToolBox.cs
View File

@ -25,11 +25,6 @@ namespace BizHawk.Client.EmuHawk
private void ToolBox_Load(object sender, EventArgs e)
{
if (OSTailoredCode.IsUnixHost)
{
Close();
return;
}
Location = new Point(
Owner.Location.X + Owner.Size.Width,
Owner.Location.Y
@ -38,7 +33,6 @@ namespace BizHawk.Client.EmuHawk
public override void Restart()
{
if (OSTailoredCode.IsUnixHost) return;
SetTools();
SetSize();