mirrors/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy synced 2025-04-29 12:23:53 +00:00
Code Issues Releases Wiki Activity

Add mouse click vs drag logic.

Browse Source
This commit is contained in:
Bartosz Taudul 2020-08-01 12:35:15 +02:00
parent 4da8385300
commit b4021d7d79
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
server/TracyMouse.cpp
View File

@ -1,3 +1,5 @@
#include <cmath>
#include "TracyMouse.hpp" #include "TracyMouse.hpp"
#include "../imgui/imgui_internal.h" #include "../imgui/imgui_internal.h"
@ -6,16 +8,19 @@ namespace tracy
{ {
static constexpr int MouseButtons = IM_ARRAYSIZE( ImGuiContext::IO.MouseDown ); static constexpr int MouseButtons = IM_ARRAYSIZE( ImGuiContext::IO.MouseDown );
static constexpr float MouseDragTreshold = 2;
struct Mouse struct Mouse
{ {
bool mouseDown[MouseButtons]; bool mouseDown[MouseButtons];
bool mouseClicked[MouseButtons]; bool mouseClicked[MouseButtons];
bool mouseReleased[MouseButtons];
bool mouseDragging[MouseButtons]; bool mouseDragging[MouseButtons];
ImVec2 mouseDragDelta[MouseButtons]; ImVec2 mouseDragDelta[MouseButtons];
bool mousePotentialClickRelease[MouseButtons];
}; };
static Mouse s_mouse; static Mouse s_mouse = {};
void MouseFrame() void MouseFrame()
{ {
@ -23,8 +28,24 @@ void MouseFrame()
{ {
s_mouse.mouseDown[i] = ImGui::IsMouseDown( i ); s_mouse.mouseDown[i] = ImGui::IsMouseDown( i );
s_mouse.mouseClicked[i] = ImGui::IsMouseClicked( i ); s_mouse.mouseClicked[i] = ImGui::IsMouseClicked( i );
s_mouse.mouseReleased[i] = ImGui::IsMouseReleased( i );
s_mouse.mouseDragging[i] = ImGui::IsMouseDragging( i, 0 ); s_mouse.mouseDragging[i] = ImGui::IsMouseDragging( i, 0 );
s_mouse.mouseDragDelta[i] = ImGui::GetMouseDragDelta( i, 0 ); s_mouse.mouseDragDelta[i] = ImGui::GetMouseDragDelta( i, 0 );
if( s_mouse.mouseDragging[i] )
{
if( s_mouse.mouseClicked[i] || s_mouse.mousePotentialClickRelease[i] )
{
if( std::abs( s_mouse.mouseDragDelta[i].x ) < MouseDragTreshold && std::abs( s_mouse.mouseDragDelta[i].y ) < MouseDragTreshold )
{
s_mouse.mouseDragging[i] = false;
}
else
{
s_mouse.mousePotentialClickRelease[i] = false;
}
}
}
} }
} }
@ -56,4 +77,11 @@ void ConsumeMouseEvents( ImGuiMouseButton button )
s_mouse.mouseDragDelta[button] = ImVec2( 0, 0 ); s_mouse.mouseDragDelta[button] = ImVec2( 0, 0 );
} }
bool IsMouseClickReleased( ImGuiMouseButton button )
{
if( s_mouse.mouseReleased[button] && s_mouse.mousePotentialClickRelease[button] ) return true;
if( s_mouse.mouseClicked[button] ) s_mouse.mousePotentialClickRelease[button] = true;
return false;
}
} }

1
server/TracyMouse.hpp
View File

@ -14,6 +14,7 @@ bool IsMouseDragging( ImGuiMouseButton button );
ImVec2 GetMouseDragDelta( ImGuiMouseButton button ); ImVec2 GetMouseDragDelta( ImGuiMouseButton button );
void ConsumeMouseEvents( ImGuiMouseButton button ); void ConsumeMouseEvents( ImGuiMouseButton button );
bool IsMouseClickReleased( ImGuiMouseButton button );
} }