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

Fix broken window Z order when editing a symbol from the schematic.

This commit is contained in:
Wayne Stambaugh 2023-03-16 15:18:27 -04:00
parent 6d296038f3
commit e51594cdf5
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
eeschema/symbol_editor/symbol_edit_frame.cpp
View File

@ -78,8 +78,6 @@ bool SYMBOL_EDIT_FRAME::m_showDeMorgan = false;
BEGIN_EVENT_TABLE( SYMBOL_EDIT_FRAME, SCH_BASE_FRAME ) BEGIN_EVENT_TABLE( SYMBOL_EDIT_FRAME, SCH_BASE_FRAME )
EVT_SIZE( SYMBOL_EDIT_FRAME::OnSize )
EVT_COMBOBOX( ID_LIBEDIT_SELECT_UNIT_NUMBER, SYMBOL_EDIT_FRAME::OnSelectUnit ) EVT_COMBOBOX( ID_LIBEDIT_SELECT_UNIT_NUMBER, SYMBOL_EDIT_FRAME::OnSelectUnit )
// menubar commands // menubar commands
@ -100,8 +98,9 @@ SYMBOL_EDIT_FRAME::SYMBOL_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
SCH_BASE_FRAME( aKiway, aParent, FRAME_SCH_SYMBOL_EDITOR, _( "Library Editor" ), SCH_BASE_FRAME( aKiway, aParent, FRAME_SCH_SYMBOL_EDITOR, _( "Library Editor" ),
wxDefaultPosition, wxDefaultSize, KICAD_DEFAULT_DRAWFRAME_STYLE, wxDefaultPosition, wxDefaultSize, KICAD_DEFAULT_DRAWFRAME_STYLE,
LIB_EDIT_FRAME_NAME ), LIB_EDIT_FRAME_NAME ),
m_unitSelectBox( nullptr ), m_unitSelectBox( nullptr ),
m_isSymbolFromSchematic( false ) m_isSymbolFromSchematic( false ),
m_initialRaise( false )
{ {
SetShowDeMorgan( false ); SetShowDeMorgan( false );
m_SyncPinEdit = false; m_SyncPinEdit = false;
@ -221,9 +220,6 @@ SYMBOL_EDIT_FRAME::SYMBOL_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
treePane.MinSize( 250, -1 ); treePane.MinSize( 250, -1 );
} }
Raise();
Show( true );
SyncView(); SyncView();
GetCanvas()->GetView()->UseDrawPriority( true ); GetCanvas()->GetView()->UseDrawPriority( true );
GetCanvas()->GetGAL()->SetAxesEnabled( true ); GetCanvas()->GetGAL()->SetAxesEnabled( true );
@ -251,11 +247,14 @@ SYMBOL_EDIT_FRAME::SYMBOL_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
Bind( wxEVT_CHAR, &TOOL_DISPATCHER::DispatchWxEvent, m_toolDispatcher ); Bind( wxEVT_CHAR, &TOOL_DISPATCHER::DispatchWxEvent, m_toolDispatcher );
Bind( wxEVT_CHAR_HOOK, &TOOL_DISPATCHER::DispatchWxEvent, m_toolDispatcher ); Bind( wxEVT_CHAR_HOOK, &TOOL_DISPATCHER::DispatchWxEvent, m_toolDispatcher );
// Ensure the window is on top
Raise();
if( loadingCancelled ) if( loadingCancelled )
ShowInfoBarWarning( _( "Symbol library loading was cancelled by user." ) ); ShowInfoBarWarning( _( "Symbol library loading was cancelled by user." ) );
// This is an ugly hack to ensure that the symbol editor window gets raised to the top when
// launched from the schematic editor edit symbol in symbol editor tool.
Bind( wxEVT_IDLE, &SYMBOL_EDIT_FRAME::onIdle, this );
Show( true );
} }
@ -285,6 +284,18 @@ SYMBOL_EDIT_FRAME::~SYMBOL_EDIT_FRAME()
} }
void SYMBOL_EDIT_FRAME::onIdle( wxIdleEvent& aEvent )
{
if( !m_initialRaise )
{
Unbind( wxEVT_IDLE, &SYMBOL_EDIT_FRAME::onIdle, this );
Raise();
GetCanvas()->SetFocus();
m_initialRaise = true;
}
}
void SYMBOL_EDIT_FRAME::LoadSettings( APP_SETTINGS_BASE* aCfg ) void SYMBOL_EDIT_FRAME::LoadSettings( APP_SETTINGS_BASE* aCfg )
{ {
wxCHECK_RET( m_settings, "Call to SYMBOL_EDIT_FRAME::LoadSettings with null m_boardAdapter" ); wxCHECK_RET( m_settings, "Call to SYMBOL_EDIT_FRAME::LoadSettings with null m_boardAdapter" );

3
eeschema/symbol_editor/symbol_edit_frame.h
View File

@ -399,6 +399,8 @@ protected:
void doReCreateMenuBar() override; void doReCreateMenuBar() override;
void onIdle( wxIdleEvent& aEvent );
private: private:
// Set up the tool framework // Set up the tool framework
void setupTools(); void setupTools();
@ -564,6 +566,7 @@ private:
///< Flag if the symbol being edited was loaded directly from a schematic. ///< Flag if the symbol being edited was loaded directly from a schematic.
bool m_isSymbolFromSchematic; bool m_isSymbolFromSchematic;
bool m_initialRaise;
KIID m_schematicSymbolUUID; KIID m_schematicSymbolUUID;
///< RefDes of the symbol (only valid if symbol was loaded from schematic) ///< RefDes of the symbol (only valid if symbol was loaded from schematic)