claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'master' into qt-wacom-serial

Browse Source
This commit is contained in:
Cacodemon345
2023-02-07 17:04:25 +06:00
committed by GitHub
parent 3884e5874b 8910c10d94
commit 17d4e4a7e2
588 changed files with 14944 additions and 9389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/win/win_ui.c
View File

@@ -10,7 +10,7 @@
*
*
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Authors: Sarah Walker, <https://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
* Fred N. van Kempen, <decwiz@yahoo.com>
*
@@ -44,7 +44,9 @@
#include <86box/ui.h>
#include <86box/win.h>
#include <86box/version.h>
#include <86box/discord.h>
#ifdef DISCORD
# include <86box/discord.h>
#endif
#ifdef MTR_ENABLED
# include <minitrace/minitrace.h>
@@ -276,6 +278,12 @@ ResetAllMenus(void)
CheckMenuItem(menuMain, IDM_VID_SCALE_1X + 1, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_SCALE_1X + 2, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_SCALE_1X + 3, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_SCALE_1X + 4, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_SCALE_1X + 5, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_SCALE_1X + 6, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_SCALE_1X + 7, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_SCALE_1X + 8, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_SCALE_1X + 9, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_HIDPI, MF_UNCHECKED);
CheckMenuItem(menuMain, IDM_VID_CGACON, MF_UNCHECKED);
@@ -316,10 +324,13 @@ ResetAllMenus(void)
video_set_filter_menu(menuMain);
#ifdef DISCORD
if (discord_loaded)
CheckMenuItem(menuMain, IDM_DISCORD, enable_discord ? MF_CHECKED : MF_UNCHECKED);
else
EnableMenuItem(menuMain, IDM_DISCORD, MF_DISABLED);
#endif
#ifdef MTR_ENABLED
EnableMenuItem(menuMain, IDM_ACTION_END_TRACE, MF_DISABLED);
#endif
@@ -820,6 +831,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
config_save();
break;
#ifdef DISCORD
case IDM_DISCORD:
if (!discord_loaded)
break;
@@ -831,6 +843,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
} else
discord_close();
break;
#endif
default:
media_menu_proc(hwnd, message, wParam, lParam);
@@ -1212,6 +1225,7 @@ ui_init(int nCmdShow)
return (0);
}
#ifdef DISCORD
if (!discord_load()) {
enable_discord = 0;
} else if (enable_discord) {
@@ -1221,6 +1235,7 @@ ui_init(int nCmdShow)
/* Update Discord status */
discord_update_activity(dopause);
}
#endif
/* Create our main window's class and register it. */
wincl.hInstance = hinstance;
@@ -1451,9 +1466,11 @@ ui_init(int nCmdShow)
plat_setfullscreen(0);
}
#ifdef DISCORD
/* Run Discord API callbacks */
if (enable_discord)
discord_run_callbacks();
#endif
}
timeEndPeriod(1);
@@ -1471,8 +1488,10 @@ ui_init(int nCmdShow)
win_mouse_close();
#ifdef DISCORD
/* Shut down the Discord integration */
discord_close();
#endif
if (user32_handle != NULL)
dynld_close(user32_handle);
@@ -1521,9 +1540,11 @@ plat_pause(int p)
CheckMenuItem(menuMain, IDM_ACTION_PAUSE,
(dopause) ? MF_CHECKED : MF_UNCHECKED);
#ifdef DISCORD
/* Update Discord status */
if (enable_discord)
discord_update_activity(dopause);
#endif
/* Update the toolbar */
ToolBarUpdatePause(p);