From c016bea0201eb0939ac78404dc284df8a6383134 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Sat, 6 May 2023 11:04:16 +0100 Subject: [PATCH] Make sure mouse isn't captured when dialog is raised. Fixes https://gitlab.com/kicad/code/kicad/issues/14685 --- eeschema/tools/sch_drawing_tools.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/eeschema/tools/sch_drawing_tools.cpp b/eeschema/tools/sch_drawing_tools.cpp index 228d1bedd2..9bddd09f50 100644 --- a/eeschema/tools/sch_drawing_tools.cpp +++ b/eeschema/tools/sch_drawing_tools.cpp @@ -195,11 +195,10 @@ int SCH_DRAWING_TOOLS::PlaceSymbol( const TOOL_EVENT& aEvent ) if( cfg->m_AnnotatePanel.automatic || newReference.AlwaysAnnotate() ) { - refs.ReannotateByOptions( - (ANNOTATE_ORDER_T) cfg->m_AnnotatePanel.sort_order, - (ANNOTATE_ALGO_T) cfg->m_AnnotatePanel.method, - m_frame->Schematic().Settings().m_AnnotateStartNum, existingRefs, - false, &hierarchy ); + refs.ReannotateByOptions( (ANNOTATE_ORDER_T) cfg->m_AnnotatePanel.sort_order, + (ANNOTATE_ALGO_T) cfg->m_AnnotatePanel.method, + m_frame->Schematic().Settings().m_AnnotateStartNum, + existingRefs, false, &hierarchy ); refs.UpdateAnnotation(); @@ -1644,6 +1643,9 @@ int SCH_DRAWING_TOOLS::DrawShape( const TOOL_EVENT& aEvent ) SCH_TEXTBOX* textbox = static_cast( item ); 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 // TwoClickPlace wait routines in the middle if( dlg.ShowModal() != wxID_OK )