empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI: Fixed oversized font when starting emulator

Browse source
This commit is contained in:
Sour 2018-07-08 20:22:21 -04:00
parent 5c23fa61c7
commit 2b41a15941
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
GUI.NET/Forms/frmMain.cs
View file

@ -151,7 +151,7 @@ namespace Mesen.GUI.Forms
#if HIDETESTMENU
mnuTests.Visible = false;
#endif
InitializeCore();
InteropEmu.InitDll();
_notifListener = new InteropEmu.NotificationListener(InteropEmu.ConsoleId.Master);
_notifListener.OnNotification += _notifListener_OnNotification;
@ -171,6 +171,7 @@ namespace Mesen.GUI.Forms
UpdateVideoSettings();
InitializeCore();
PerformUpgrade();
InitializeEmu();

1
GUI.NET/InteropEmu.cs
View file

@ -16,6 +16,7 @@ namespace Mesen.GUI
{
private const string DLLPath = "MesenCore.dll";
[DllImport(DLLPath)] [return: MarshalAs(UnmanagedType.I1)] public static extern bool TestDll();
[DllImport(DLLPath)] public static extern void InitDll();
[DllImport(DLLPath, EntryPoint = "GetMesenVersion")] private static extern UInt32 GetMesenVersionWrapper();

8
InteropDLL/ConsoleWrapper.cpp
View file

@ -114,11 +114,15 @@ namespace InteropEmu {
DllExport uint32_t __stdcall GetMesenVersion() { return EmulationSettings::GetMesenVersion(); }
DllExport void __stdcall InitDll()
{
_console.reset(new Console());
_console->Init();
}
DllExport void __stdcall InitializeEmu(const char* homeFolder, void *windowHandle, void *viewerHandle, bool noAudio, bool noVideo, bool noInput)
{
FolderUtilities::SetHomeFolder(homeFolder);
_console.reset(new Console());
_console->Init();
_shortcutKeyHandler.reset(new ShortcutKeyHandler(_console));
if(windowHandle != nullptr && viewerHandle != nullptr) {