Editor: Make selection rect start at click point

ngscopeclient · Aug 21, 2022 · 345becf · 345becf
1 parent 09ce80d
commit 345becf
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
@@ -179,3 +179,4 @@ v0.9.1 (WIP):
 
     BUGFIX: Editor: Improve link dragging with fast movement (#156)
 
+    BUGFIX: Editor: Make selection rect start at click point
diff --git a/imgui_node_editor.cpp b/imgui_node_editor.cpp
@@ -3917,7 +3917,7 @@ ed::EditorAction::AcceptResult ed::SelectAction::Accept(const Control& control)
     if (Editor->CanAcceptUserInput() && control.BackgroundHot && ImGui::IsMouseDragging(Editor->GetConfig().SelectButtonIndex, 1))
     {
         m_IsActive = true;
-        m_StartPoint = ImGui::GetMousePos();
+        m_StartPoint = ImGui_GetMouseClickPos(Editor->GetConfig().SelectButtonIndex);
         m_EndPoint   = m_StartPoint;
 
         // Links and nodes cannot be selected together

diff --git a/imgui_node_editor_internal.h b/imgui_node_editor_internal.h
@@ -56,6 +56,7 @@ void Log(const char* fmt, ...);
 //inline ImRect ToRect(const ax::rectf& rect);
 //inline ImRect ToRect(const ax::rect& rect);
 inline ImRect ImGui_GetItemRect();
+inline ImVec2 ImGui_GetMouseClickPos(ImGuiMouseButton buttonIndex);
 
 
 //------------------------------------------------------------------------------

diff --git a/imgui_node_editor_internal.inl b/imgui_node_editor_internal.inl
@@ -46,6 +46,14 @@ inline ImRect ImGui_GetItemRect()
     return ImRect(ImGui::GetItemRectMin(), ImGui::GetItemRectMax());
 }
 
+inline ImVec2 ImGui_GetMouseClickPos(ImGuiMouseButton buttonIndex)
+{
+    if (ImGui::IsMouseDown(buttonIndex))
+        return ImGui::GetIO().MouseClickedPos[buttonIndex];
+    else
+        return ImGui::GetMousePos();
+}
+
 
 //------------------------------------------------------------------------------
 } // namespace Detail
Original file line number	Diff line number	Diff line change
Expand Up		@@ -179,3 +179,4 @@ v0.9.1 (WIP):

		BUGFIX: Editor: Improve link dragging with fast movement (#156)

		BUGFIX: Editor: Make selection rect start at click point