poret/UnrealImGui
1
0
Fork 0
mirror of https://github.com/kevinporetti/UnrealImGui.git synced 2025-01-18 16:30:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated input handler to ignore fake mouse events potentially raised when touch input is unhandled.

Browse Source
This commit is contained in:
Sebastian 2019-08-08 18:06:07 +01:00
parent 71dd082f69
commit 95d27334fe
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/ImGui/Private/ImGuiInputHandler.cpp
View File

@ -117,6 +117,11 @@ FReply UImGuiInputHandler::OnAnalogValueChanged(const FAnalogInputEvent& AnalogI
FReply UImGuiInputHandler::OnMouseButtonDown(const FPointerEvent& MouseEvent) FReply UImGuiInputHandler::OnMouseButtonDown(const FPointerEvent& MouseEvent)
{ {
if (MouseEvent.IsTouchEvent())
{
return ToReply(false);
}
InputState->SetMouseDown(MouseEvent, true); InputState->SetMouseDown(MouseEvent, true);
return ToReply(true); return ToReply(true);
} }
@ -129,6 +134,11 @@ FReply UImGuiInputHandler::OnMouseButtonDoubleClick(const FPointerEvent& MouseEv
FReply UImGuiInputHandler::OnMouseButtonUp(const FPointerEvent& MouseEvent) FReply UImGuiInputHandler::OnMouseButtonUp(const FPointerEvent& MouseEvent)
{ {
if (MouseEvent.IsTouchEvent())
{
return ToReply(false);
}
InputState->SetMouseDown(MouseEvent, false); InputState->SetMouseDown(MouseEvent, false);
return ToReply(true); return ToReply(true);
} }
@ -139,6 +149,16 @@ FReply UImGuiInputHandler::OnMouseWheel(const FPointerEvent& MouseEvent)
return ToReply(true); return ToReply(true);
} }
FReply UImGuiInputHandler::OnMouseMove(const FVector2D& MousePosition, const FPointerEvent& MouseEvent)
{
if (MouseEvent.IsTouchEvent())
{
return ToReply(false);
}
return OnMouseMove(MousePosition);
}
FReply UImGuiInputHandler::OnMouseMove(const FVector2D& MousePosition) FReply UImGuiInputHandler::OnMouseMove(const FVector2D& MousePosition)
{ {
InputState->SetMousePosition(MousePosition); InputState->SetMousePosition(MousePosition);

2
Source/ImGui/Private/Widgets/SImGuiWidget.cpp
View File

@ -189,7 +189,7 @@ FReply SImGuiWidget::OnMouseWheel(const FGeometry& MyGeometry, const FPointerEve
FReply SImGuiWidget::OnMouseMove(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) FReply SImGuiWidget::OnMouseMove(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent)
{ {
return InputHandler->OnMouseMove(TransformScreenPointToImGui(MyGeometry, MouseEvent.GetScreenSpacePosition())); return InputHandler->OnMouseMove(TransformScreenPointToImGui(MyGeometry, MouseEvent.GetScreenSpacePosition()), MouseEvent);
} }
FReply SImGuiWidget::OnFocusReceived(const FGeometry& MyGeometry, const FFocusEvent& FocusEvent) FReply SImGuiWidget::OnFocusReceived(const FGeometry& MyGeometry, const FFocusEvent& FocusEvent)

2
Source/ImGui/Public/ImGuiInputHandler.h
View File

@ -83,8 +83,10 @@ public:
/** /**
* Called to handle mouse move events. * Called to handle mouse move events.
* @param MousePosition Mouse position (in ImGui space) * @param MousePosition Mouse position (in ImGui space)
* @param MouseEvent Optional mouse event passed from Slate
* @returns Response whether the event was handled * @returns Response whether the event was handled
*/ */
virtual FReply OnMouseMove(const FVector2D& MousePosition, const FPointerEvent& MouseEvent);
virtual FReply OnMouseMove(const FVector2D& MousePosition); virtual FReply OnMouseMove(const FVector2D& MousePosition);
/** /**