浏览代码

Merge pull request #28061 from guilhermefelipecgs/fix_19137

[Input] Release keys/actions pressed if window loses focus
Rémi Verschelde 6 年之前
父节点
当前提交
b2f6beb888
共有 5 个文件被更改,包括 23 次插入0 次删除
  1. 13 0
      main/input_default.cpp
  2. 1 0
      main/input_default.h
  3. 5 0
      platform/osx/os_osx.mm
  4. 2 0
      platform/windows/os_windows.cpp
  5. 2 0
      platform/x11/os_x11.cpp

+ 13 - 0
main/input_default.cpp

@@ -677,6 +677,19 @@ void InputDefault::set_use_accumulated_input(bool p_enable) {
 	use_accumulated_input = p_enable;
 }
 
+void InputDefault::release_pressed_events() {
+
+	flush_accumulated_events(); // this is needed to release actions strengths
+
+	keys_pressed.clear();
+	joy_buttons_pressed.clear();
+	_joy_axis.clear();
+
+	for (Map<StringName, InputDefault::Action>::Element *E = action_state.front(); E; E = E->next()) {
+		action_release(E->key());
+	}
+}
+
 InputDefault::InputDefault() {
 
 	use_accumulated_input = true;

+ 1 - 0
main/input_default.h

@@ -272,6 +272,7 @@ public:
 	virtual void flush_accumulated_events();
 	virtual void set_use_accumulated_input(bool p_enable);
 
+	virtual void release_pressed_events();
 	InputDefault();
 };
 

+ 5 - 0
platform/osx/os_osx.mm

@@ -337,6 +337,11 @@ static CVReturn DisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTimeSt
 }
 
 - (void)windowDidMove:(NSNotification *)notification {
+
+	if (OS_OSX::singleton->get_main_loop()) {
+		OS_OSX::singleton->input->release_pressed_events();
+	}
+
 	/*
 	[window->nsgl.context update];
 

+ 2 - 0
platform/windows/os_windows.cpp

@@ -346,6 +346,7 @@ LRESULT OS_Windows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 				control_mem = false;
 				shift_mem = false;
 			} else { // WM_INACTIVE
+				input->release_pressed_events();
 				main_loop->notification(MainLoop::NOTIFICATION_WM_FOCUS_OUT);
 				alt_mem = false;
 			};
@@ -786,6 +787,7 @@ LRESULT OS_Windows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 		} break;
 
 		case WM_ENTERSIZEMOVE: {
+			input->release_pressed_events();
 			move_timer_id = SetTimer(hWnd, 1, USER_TIMER_MINIMUM, (TIMERPROC)NULL);
 		} break;
 		case WM_EXITSIZEMOVE: {

+ 2 - 0
platform/x11/os_x11.cpp

@@ -2076,7 +2076,9 @@ void OS_X11::process_xevents() {
 
 			case FocusOut:
 				window_has_focus = false;
+				input->release_pressed_events();
 				main_loop->notification(MainLoop::NOTIFICATION_WM_FOCUS_OUT);
+
 				if (mouse_mode_grab) {
 					//dear X11, I try, I really try, but you never work, you do whathever you want.
 					if (mouse_mode == MOUSE_MODE_CAPTURED) {