haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Point editor: manually manage grid lifetime for now 

Will prevent crashes until we can fix this correctly.
This commit is contained in:
Mike Williams 2023-10-23 10:57:54 -04:00
parent 91b6bb8088
commit 8ec2eb600a
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
eeschema/tools/ee_point_editor.cpp
View File

@ -437,7 +437,7 @@ int EE_POINT_EDITOR::Main( const TOOL_EVENT& aEvent )
Activate(); Activate();
KIGFX::VIEW_CONTROLS* controls = getViewControls(); KIGFX::VIEW_CONTROLS* controls = getViewControls();
EE_GRID_HELPER grid( m_toolMgr ); EE_GRID_HELPER* grid = new EE_GRID_HELPER( m_toolMgr );
VECTOR2I cursorPos; VECTOR2I cursorPos;
KIGFX::VIEW* view = getView(); KIGFX::VIEW* view = getView();
EDA_ITEM* item = selection.Front(); EDA_ITEM* item = selection.Front();
@ -454,10 +454,10 @@ int EE_POINT_EDITOR::Main( const TOOL_EVENT& aEvent )
// Main loop: keep receiving events // Main loop: keep receiving events
while( TOOL_EVENT* evt = Wait() ) while( TOOL_EVENT* evt = Wait() )
{ {
grid.SetSnap( !evt->Modifier( MD_SHIFT ) ); grid->SetSnap( !evt->Modifier( MD_SHIFT ) );
grid.SetUseGrid( getView()->GetGAL()->GetGridSnapping() && !evt->DisableGridSnapping() ); grid->SetUseGrid( getView()->GetGAL()->GetGridSnapping() && !evt->DisableGridSnapping() );
cursorPos = grid.Align( controls->GetMousePosition(), GRID_HELPER_GRIDS::GRID_GRAPHICS ); cursorPos = grid->Align( controls->GetMousePosition(), GRID_HELPER_GRIDS::GRID_GRAPHICS );
controls->ForceCursorPosition( true, cursorPos ); controls->ForceCursorPosition( true, cursorPos );
if( !m_editPoints || evt->IsSelectionEvent() ) if( !m_editPoints || evt->IsSelectionEvent() )
@ -511,6 +511,17 @@ int EE_POINT_EDITOR::Main( const TOOL_EVENT& aEvent )
{ {
if( inDrag ) // Restore the last change if( inDrag ) // Restore the last change
{ {
// Currently we are manually managing the lifetime of the grid
// helpers because there is a bug in the tool stack that adds
// the point editor again when commit.Revert() rebuilds the selection.
// We remove this grid here so the its destructor is called before it
// is added again.
if( grid )
{
delete grid;
grid = nullptr;
}
commit.Revert(); commit.Revert();
inDrag = false; inDrag = false;
break; break;
@ -544,6 +555,9 @@ int EE_POINT_EDITOR::Main( const TOOL_EVENT& aEvent )
m_frame->GetCanvas()->Refresh(); m_frame->GetCanvas()->Refresh();
} }
if( grid )
delete grid;
return 0; return 0;
} }