From 2d0b910aa257e7ac46e4a4c8f3d5b4cbf63407c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= Date: Mon, 16 Nov 2020 18:08:28 +0100 Subject: [PATCH 1/2] Update pull_request_template.md --- .github/pull_request_template.md | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 2ed0e4596..e09b5636f 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -2,17 +2,12 @@ Summary ======= _Briefly describe what you are submitting._ -Approach -======== -_How did you address the problem?_ - Checklist ========= -* [ ] Closes issue #xxx +* [ ] Closes #xxx * [ ] I have discussed this with core contributors already -* [ ] This pull request requires inclusion of a ROM in the romset +* [ ] This pull request requires changes to the ROM set * [ ] I have opened a roms pull request - https://github.com/86Box/roms/pull/changeme/ -* [ ] My commit messages are descriptive and I have not added any irrelevant files to the repository References ========== From e0ff781a345d3ddf077e240c185cf6ddc474a753 Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Mon, 16 Nov 2020 22:09:13 +0500 Subject: [PATCH 2/2] Fix the mouse lock after fullscreen - for real this time. (#1080) --- src/include/86box/win.h | 1 + src/win/win_sdl.c | 4 +--- src/win/win_ui.c | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/include/86box/win.h b/src/include/86box/win.h index 9d3e8724b..a181dad06 100644 --- a/src/include/86box/win.h +++ b/src/include/86box/win.h @@ -99,6 +99,7 @@ extern HWND hwndMain, extern HANDLE ghMutex; extern LCID lang_id; extern HICON hIcon[256]; +extern RECT oldclip; // extern int status_is_open; diff --git a/src/win/win_sdl.c b/src/win/win_sdl.c index 0224b65b0..9d3a9b4cd 100644 --- a/src/win/win_sdl.c +++ b/src/win/win_sdl.c @@ -326,7 +326,7 @@ sdl_init_common(int flags) wchar_t temp[128]; SDL_version ver; int w = 0, h = 0, x = 0, y = 0; - RECT rect, oldclip; + RECT rect; sdl_log("SDL: init (fs=%d)\n", fs); @@ -389,8 +389,6 @@ sdl_init_common(int flags) /* Now create the SDL window from that. */ sdl_win = SDL_CreateWindowFrom((void *)sdl_hwnd); - GetClipCursor(&oldclip); - old_capture = mouse_capture; GetWindowRect(sdl_hwnd, &rect); diff --git a/src/win/win_ui.c b/src/win/win_ui.c index 79bfa0b27..4ad451058 100644 --- a/src/win/win_ui.c +++ b/src/win/win_ui.c @@ -1089,6 +1089,8 @@ ui_init(int nCmdShow) /* Make the window visible on the screen. */ ShowWindow(hwnd, nCmdShow); + GetClipCursor(&oldclip); + /* Initialize the RawInput (keyboard) module. */ memset(&ridev, 0x00, sizeof(ridev)); ridev.usUsagePage = 0x01;