Fix the delete tool not immediately setting cursor

Fix #5939
2020-10-09 18:51:10 -04:00 · 2020-10-09 18:51:10 -04:00 · 511bdb64e1
parent 7f3ed1479e
commit 511bdb64e1
1 changed files with 10 additions and 1 deletions
--- a/common/tool/picker_tool.cpp
+++ b/common/tool/picker_tool.cpp
@ -64,9 +64,18 @@ int PICKER_TOOL::Main( const TOOL_EVENT& aEvent )

    setControls();

-    while( TOOL_EVENT* evt = Wait() )
+    auto setCursor =
+            [&]()
            {
                m_frame->GetCanvas()->SetCurrentCursor( m_cursor );
+            };
+
+    // Set initial cursor
+    setCursor();
+
+    while( TOOL_EVENT* evt = Wait() )
+    {
+        setCursor();
        VECTOR2D cursorPos = controls->GetCursorPosition( m_frame->IsGridVisible() );

        if( evt->IsCancelInteractive() || evt->IsActivate() )