Merge pull request #33096 from jcs224/windows-screendrag-relative

Allow use of relative and speed properties for InputEventScreenDrag on Windows
This commit is contained in:
Rémi Verschelde 2019-10-27 09:47:12 +01:00 committed by GitHub
commit 4f0c05402f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -288,15 +288,16 @@ void OS_Windows::_drag_event(float p_x, float p_y, int idx) {
if (curr->get() == Vector2(p_x, p_y)) if (curr->get() == Vector2(p_x, p_y))
return; return;
curr->get() = Vector2(p_x, p_y);
Ref<InputEventScreenDrag> event; Ref<InputEventScreenDrag> event;
event.instance(); event.instance();
event->set_index(idx); event->set_index(idx);
event->set_position(Vector2(p_x, p_y)); event->set_position(Vector2(p_x, p_y));
event->set_relative(Vector2(p_x, p_y) - curr->get());
if (main_loop) if (main_loop)
input->accumulate_input_event(event); input->accumulate_input_event(event);
curr->get() = Vector2(p_x, p_y);
}; };
LRESULT OS_Windows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { LRESULT OS_Windows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) {