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

Take a stab at fixing some likely-event-ordering issues on MSW. 

Fixes https://gitlab.com/kicad/code/kicad/issues/12289
This commit is contained in:
Jeff Young 2022-08-26 17:02:59 +01:00
parent 3da2f79d0e
commit a90f223644
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
eeschema/dialogs/panel_setup_buses.cpp
View File

@ -284,6 +284,19 @@ void PANEL_SETUP_BUSES::doReloadMembersGrid()
if( m_lastAlias >= 0 && m_lastAlias < m_aliasesGrid->GetNumberRows() ) if( m_lastAlias >= 0 && m_lastAlias < m_aliasesGrid->GetNumberRows() )
{ {
const std::shared_ptr<BUS_ALIAS>& alias = m_aliases[ m_lastAlias ]; const std::shared_ptr<BUS_ALIAS>& alias = m_aliases[ m_lastAlias ];
wxString source;
wxString membersLabel;
if( alias->GetParent() )
{
wxFileName sheet_name( alias->GetParent()->GetFileName() );
source.Printf( wxS( "(" ) + sheet_name.GetFullName() + wxS( ")" ) );
}
membersLabel.Printf( m_membersLabelTemplate, m_lastAliasName );
m_source->SetLabel( source );
m_membersLabel->SetLabel( membersLabel );
m_membersGrid->ClearRows(); m_membersGrid->ClearRows();
m_membersGrid->AppendRows( alias->Members().size() ); m_membersGrid->AppendRows( alias->Members().size() );
@ -379,30 +392,16 @@ void PANEL_SETUP_BUSES::OnUpdateUI( wxUpdateUIEvent& event )
} }
else if( row != m_lastAlias || aliasName != m_lastAliasName ) else if( row != m_lastAlias || aliasName != m_lastAliasName )
{ {
if( m_membersBook->GetSelection() != 0 ) m_lastAlias = row;
{ m_lastAliasName = aliasName;
m_membersBook->SetSelection( 0 );
m_membersBook->GetPage( 0 )->Layout(); m_membersBook->SetSelection( 0 );
} m_membersBook->GetPage( 0 )->Layout();
const std::shared_ptr<BUS_ALIAS>& alias = m_aliases[ row ]; const std::shared_ptr<BUS_ALIAS>& alias = m_aliases[ row ];
alias->SetName( aliasName ); alias->SetName( aliasName );
m_membersLabel->SetLabel( wxString::Format( m_membersLabelTemplate, aliasName ) );
if( alias->GetParent() ) Bind( wxEVT_IDLE, &PANEL_SETUP_BUSES::reloadMembersGridOnIdle, this );
{
wxFileName sheet_name( alias->GetParent()->GetFileName() );
m_source->SetLabel( wxS( "(" ) + sheet_name.GetFullName() + wxS( ")" ) );
}
else
{
m_source->SetLabel( wxEmptyString );
}
doReloadMembersGrid();
m_lastAlias = row;
m_lastAliasName = aliasName;
} }
} }
} }