Make sure mouse isn't captured when dialog is raised.

Fixes https://gitlab.com/kicad/code/kicad/issues/14685
This commit is contained in:
Jeff Young 2023-05-06 11:04:16 +01:00
parent a22e6db982
commit c016bea020
1 changed files with 7 additions and 5 deletions

View File

@ -195,11 +195,10 @@ int SCH_DRAWING_TOOLS::PlaceSymbol( const TOOL_EVENT& aEvent )
if( cfg->m_AnnotatePanel.automatic || newReference.AlwaysAnnotate() ) if( cfg->m_AnnotatePanel.automatic || newReference.AlwaysAnnotate() )
{ {
refs.ReannotateByOptions( refs.ReannotateByOptions( (ANNOTATE_ORDER_T) cfg->m_AnnotatePanel.sort_order,
(ANNOTATE_ORDER_T) cfg->m_AnnotatePanel.sort_order, (ANNOTATE_ALGO_T) cfg->m_AnnotatePanel.method,
(ANNOTATE_ALGO_T) cfg->m_AnnotatePanel.method, m_frame->Schematic().Settings().m_AnnotateStartNum,
m_frame->Schematic().Settings().m_AnnotateStartNum, existingRefs, existingRefs, false, &hierarchy );
false, &hierarchy );
refs.UpdateAnnotation(); refs.UpdateAnnotation();
@ -1644,6 +1643,9 @@ int SCH_DRAWING_TOOLS::DrawShape( const TOOL_EVENT& aEvent )
SCH_TEXTBOX* textbox = static_cast<SCH_TEXTBOX*>( item ); SCH_TEXTBOX* textbox = static_cast<SCH_TEXTBOX*>( item );
DIALOG_TEXT_PROPERTIES dlg( m_frame, textbox ); DIALOG_TEXT_PROPERTIES dlg( m_frame, textbox );
getViewControls()->SetAutoPan( false );
getViewControls()->CaptureCursor( false );
// This is modal not quasi to protect against place symbol calls starting // This is modal not quasi to protect against place symbol calls starting
// TwoClickPlace wait routines in the middle // TwoClickPlace wait routines in the middle
if( dlg.ShowModal() != wxID_OK ) if( dlg.ShowModal() != wxID_OK )