realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 10:13:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Don't assume a hypertext link is a cross-sheet reference.

Browse Source 
Fixes https://gitlab.com/kicad/code/kicad/-/issues/20511
This commit is contained in:
Jeff Young 2025-03-30 21:54:52 +01:00
parent 2b0d082df5
commit 582aef0220
1 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
eeschema/sch_field.cpp
View File

@ -1013,31 +1013,39 @@ void SCH_FIELD::DoHypertextAction( EDA_DRAW_FRAME* aFrame ) const
if( IsHypertext() ) if( IsHypertext() )
{ {
SCH_LABEL_BASE* label = static_cast<SCH_LABEL_BASE*>( m_parent ); wxString href;
SCH_SHEET_PATH* sheet = &label->Schematic()->CurrentSheet();
wxMenu menu;
wxString href;
std::vector<std::pair<wxString, wxString>> pages; if( m_id == FIELD_T::INTERSHEET_REFS )
label->GetIntersheetRefs( sheet, &pages );
for( int i = 0; i < (int) pages.size(); ++i )
{ {
menu.Append( i + START_ID, wxString::Format( _( "Go to Page %s (%s)" ), SCH_LABEL_BASE* label = static_cast<SCH_LABEL_BASE*>( m_parent );
pages[i].first, SCH_SHEET_PATH* sheet = &label->Schematic()->CurrentSheet();
pages[i].second ) ); wxMenu menu;
std::vector<std::pair<wxString, wxString>> pages;
label->GetIntersheetRefs( sheet, &pages );
for( int i = 0; i < (int) pages.size(); ++i )
{
menu.Append( i + START_ID, wxString::Format( _( "Go to Page %s (%s)" ),
pages[i].first,
pages[i].second ) );
}
menu.AppendSeparator();
menu.Append( 999 + START_ID, _( "Back to Previous Selected Sheet" ) );
int sel = aFrame->GetPopupMenuSelectionFromUser( menu ) - START_ID;
if( sel >= 0 && sel < (int) pages.size() )
href = wxT( "#" ) + pages[ sel ].first;
else if( sel == 999 )
href = SCH_NAVIGATE_TOOL::g_BackLink;
}
else if( IsURL( GetShownText( false ) ) )
{
href = GetShownText( false );
} }
menu.AppendSeparator();
menu.Append( 999 + START_ID, _( "Back to Previous Selected Sheet" ) );
int sel = aFrame->GetPopupMenuSelectionFromUser( menu ) - START_ID;
if( sel >= 0 && sel < (int) pages.size() )
href = wxT( "#" ) + pages[ sel ].first;
else if( sel == 999 )
href = SCH_NAVIGATE_TOOL::g_BackLink;
if( !href.IsEmpty() ) if( !href.IsEmpty() )
{ {