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

symbol viewer: fix closing issue when opened in modal mode 

Fixes #6509
https://gitlab.com/kicad/code/kicad/issues/6509
This commit is contained in:
jean-pierre charras 2020-11-29 09:01:21 +01:00
parent 095102614f
commit ebf0cb3612
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eeschema/lib_view_frame.cpp
View File

@ -66,7 +66,6 @@ int LIB_VIEW_FRAME::m_convert = 1;
BEGIN_EVENT_TABLE( LIB_VIEW_FRAME, EDA_DRAW_FRAME ) BEGIN_EVENT_TABLE( LIB_VIEW_FRAME, EDA_DRAW_FRAME )
// Window events // Window events
EVT_CLOSE( LIB_VIEW_FRAME::OnCloseWindow )
EVT_SIZE( LIB_VIEW_FRAME::OnSize ) EVT_SIZE( LIB_VIEW_FRAME::OnSize )
EVT_ACTIVATE( LIB_VIEW_FRAME::OnActivate ) EVT_ACTIVATE( LIB_VIEW_FRAME::OnActivate )
@ -406,7 +405,7 @@ bool LIB_VIEW_FRAME::ShowModal( wxString* aSymbol, wxWindow* aParent )
} }
void LIB_VIEW_FRAME::OnCloseWindow( wxCloseEvent& Event ) void LIB_VIEW_FRAME::doCloseWindow()
{ {
GetCanvas()->StopDrawing(); GetCanvas()->StopDrawing();
@ -801,7 +800,6 @@ void LIB_VIEW_FRAME::FinishModal()
} }
void LIB_VIEW_FRAME::OnSelectSymbol( wxCommandEvent& aEvent ) void LIB_VIEW_FRAME::OnSelectSymbol( wxCommandEvent& aEvent )
{ {
std::unique_lock<std::mutex> dialogLock( DIALOG_CHOOSE_COMPONENT::g_Mutex, std::defer_lock ); std::unique_lock<std::mutex> dialogLock( DIALOG_CHOOSE_COMPONENT::g_Mutex, std::defer_lock );

2
eeschema/lib_view_frame.h
View File

@ -89,7 +89,7 @@ public:
bool ReCreateListCmp(); bool ReCreateListCmp();
void DisplayLibInfos(); void DisplayLibInfos();
void OnCloseWindow( wxCloseEvent& Event ); void doCloseWindow() override;
void CloseLibraryViewer( wxCommandEvent& event ); void CloseLibraryViewer( wxCommandEvent& event );
void ReCreateHToolbar() override; void ReCreateHToolbar() override;
void ReCreateVToolbar() override; void ReCreateVToolbar() override;

2
eeschema/toolbars_lib_view.cpp
View File

@ -108,7 +108,7 @@ void LIB_VIEW_FRAME::ReCreateMenuBar()
// //
ACTION_MENU* fileMenu = new ACTION_MENU( false, libControl ); ACTION_MENU* fileMenu = new ACTION_MENU( false, libControl );
fileMenu->AddClose( _( "Footprint Viewer" ) ); fileMenu->AddClose( _( "Symbol Viewer" ) );
//-- View menu ----------------------------------------------------------- //-- View menu -----------------------------------------------------------