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

Don't allow Text Properties dialog on intersheets references field.

This commit is contained in:
Jeff Young 2021-09-29 16:04:36 +01:00
parent 3b6da14614
commit 9cf9abbd66
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
eeschema/tools/sch_edit_tool.cpp
View File

@ -1325,6 +1325,19 @@ int SCH_EDIT_TOOL::Properties( const TOOL_EVENT& aEvent )
break; break;
} }
auto doTextAndLabelProps =
[&]( SCH_TEXT* aText )
{
DIALOG_TEXT_AND_LABEL_PROPERTIES dlg( m_frame, aText );
// Must be quasi modal for syntax help
if( dlg.ShowQuasiModal() == wxID_OK )
{
m_toolMgr->PostEvent( EVENTS::SelectedItemsModified );
m_frame->OnModify();
}
};
switch( item->Type() ) switch( item->Type() )
{ {
case SCH_SYMBOL_T: case SCH_SYMBOL_T:
@ -1435,24 +1448,18 @@ int SCH_EDIT_TOOL::Properties( const TOOL_EVENT& aEvent )
case SCH_LABEL_T: case SCH_LABEL_T:
case SCH_GLOBAL_LABEL_T: case SCH_GLOBAL_LABEL_T:
case SCH_HIER_LABEL_T: case SCH_HIER_LABEL_T:
{ doTextAndLabelProps( static_cast<SCH_TEXT*>( item ) );
SCH_TEXT* text = static_cast<SCH_TEXT*>( item );
DIALOG_TEXT_AND_LABEL_PROPERTIES dlg( m_frame, text );
// Must be quasi modal for syntax help
if( dlg.ShowQuasiModal() == wxID_OK )
{
m_toolMgr->PostEvent( EVENTS::SelectedItemsModified );
m_frame->OnModify();
}
}
break; break;
case SCH_FIELD_T: case SCH_FIELD_T:
{ {
SCH_FIELD* field = static_cast<SCH_FIELD*>( item ); SCH_FIELD* field = static_cast<SCH_FIELD*>( item );
EDA_ITEM* parent = field->GetParent();
editFieldText( field ); if( parent->Type() == SCH_GLOBAL_LABEL_T )
doTextAndLabelProps( static_cast<SCH_TEXT*>( parent ) );
else
editFieldText( field );
if( !field->IsVisible() ) if( !field->IsVisible() )
clearSelection = true; clearSelection = true;