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

Reset outline font if bold or italic changed. 

Fixes https://gitlab.com/kicad/code/kicad/issues/11462
This commit is contained in:
Jeff Young 2022-04-26 12:51:39 +01:00
parent 85680886f8
commit e6f11c5c39
2 changed files with 71 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
eeschema/dialogs/dialog_global_edit_text_and_graphics.cpp
View File

@ -39,7 +39,7 @@
#include <tools/sch_edit_tool.h> #include <tools/sch_edit_tool.h>
#include <widgets/unit_binder.h> #include <widgets/unit_binder.h>
#include <widgets/font_choice.h> #include <widgets/font_choice.h>
#include "font/kicad_font_name.h"
static bool g_modifyReferences; static bool g_modifyReferences;
static bool g_modifyValues; static bool g_modifyValues;
@ -275,12 +275,22 @@ void DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::processItem( const SCH_SHEET_PATH& aS
if( m_bold->Get3StateValue() != wxCHK_UNDETERMINED ) if( m_bold->Get3StateValue() != wxCHK_UNDETERMINED )
eda_text->SetBold( m_bold->GetValue() ); eda_text->SetBold( m_bold->GetValue() );
// Must comer after bold & italic // Must come after bold & italic
if( m_fontCtrl->GetStringSelection() != INDETERMINATE_ACTION ) if( m_fontCtrl->GetStringSelection() != INDETERMINATE_ACTION )
{ {
eda_text->SetFont( m_fontCtrl->GetFontSelection( eda_text->IsBold(), eda_text->SetFont( m_fontCtrl->GetFontSelection( eda_text->IsBold(),
eda_text->IsItalic() ) ); eda_text->IsItalic() ) );
} }
else if( m_italic->Get3StateValue() != wxCHK_UNDETERMINED
|| m_bold->Get3StateValue() != wxCHK_UNDETERMINED )
{
if( !eda_text->GetFontName().IsEmpty() )
{
eda_text->SetFont( KIFONT::FONT::GetFont( eda_text->GetFontName(),
eda_text->IsBold(),
eda_text->IsItalic() ) );
}
}
} }
// No else! Labels are both. // No else! Labels are both.

100
pcbnew/dialogs/dialog_global_edit_text_and_graphics.cpp
View File

@ -41,7 +41,7 @@
#include <tools/global_edit_tool.h> #include <tools/global_edit_tool.h>
#include <tools/footprint_editor_control.h> #include <tools/footprint_editor_control.h>
#include <dialog_global_edit_text_and_graphics_base.h> #include <dialog_global_edit_text_and_graphics_base.h>
#include "font/kicad_font_name.h"
// Columns of layer classes grid // Columns of layer classes grid
enum enum
@ -327,54 +327,72 @@ void DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::processItem( BOARD_COMMIT& aCommit, B
{ {
aCommit.Modify( aItem ); aCommit.Modify( aItem );
EDA_TEXT* textItem = dynamic_cast<EDA_TEXT*>( aItem ); EDA_TEXT* edaText = dynamic_cast<EDA_TEXT*>( aItem );
FP_TEXT* fpTextItem = dynamic_cast<FP_TEXT*>( aItem ); FP_TEXT* fpText = dynamic_cast<FP_TEXT*>( aItem );
PCB_SHAPE* drawItem = dynamic_cast<PCB_SHAPE*>( aItem ); PCB_SHAPE* shape = dynamic_cast<PCB_SHAPE*>( aItem );
PCB_DIMENSION_BASE* dimension = dynamic_cast<PCB_DIMENSION_BASE*>( aItem ); PCB_DIMENSION_BASE* dimension = dynamic_cast<PCB_DIMENSION_BASE*>( aItem );
if( dimension ) if( dimension )
textItem = &dimension->Text(); edaText = &dimension->Text();
if( m_setToSpecifiedValues->GetValue() ) if( m_setToSpecifiedValues->GetValue() )
{ {
if( m_LayerCtrl->GetLayerSelection() != UNDEFINED_LAYER ) if( m_LayerCtrl->GetLayerSelection() != UNDEFINED_LAYER )
aItem->SetLayer( ToLAYER_ID( m_LayerCtrl->GetLayerSelection() ) ); aItem->SetLayer( ToLAYER_ID( m_LayerCtrl->GetLayerSelection() ) );
if( !m_textWidth.IsIndeterminate() && textItem ) if( edaText )
textItem->SetTextSize( wxSize( m_textWidth.GetValue(), textItem->GetTextSize().y ) );
if( !m_textHeight.IsIndeterminate() && textItem )
textItem->SetTextSize( wxSize( textItem->GetTextSize().x, m_textHeight.GetValue() ) );
if( !m_thickness.IsIndeterminate() && textItem )
textItem->SetTextThickness( m_thickness.GetValue() );
if( m_bold->Get3StateValue() != wxCHK_UNDETERMINED && textItem )
textItem->SetBold( m_bold->GetValue() );
if( m_italic->Get3StateValue() != wxCHK_UNDETERMINED && textItem )
textItem->SetItalic( m_italic->GetValue() );
// Must come after setting bold & italic
if( m_fontCtrl->GetStringSelection() != INDETERMINATE_ACTION && textItem )
{ {
textItem->SetFont( m_fontCtrl->GetFontSelection( textItem->IsBold(), if( !m_textWidth.IsIndeterminate() )
textItem->IsItalic() ) ); edaText->SetTextSize( wxSize( m_textWidth.GetValue(), edaText->GetTextSize().y ) );
if( !m_textHeight.IsIndeterminate() )
edaText->SetTextSize( wxSize( edaText->GetTextSize().x, m_textHeight.GetValue() ) );
if( !m_thickness.IsIndeterminate() )
edaText->SetTextThickness( m_thickness.GetValue() );
if( m_bold->Get3StateValue() != wxCHK_UNDETERMINED )
edaText->SetBold( m_bold->GetValue() );
if( m_italic->Get3StateValue() != wxCHK_UNDETERMINED )
edaText->SetItalic( m_italic->GetValue() );
// Must come after setting bold & italic
if( m_fontCtrl->GetStringSelection() != INDETERMINATE_ACTION )
{
edaText->SetFont( m_fontCtrl->GetFontSelection( edaText->IsBold(),
edaText->IsItalic() ) );
}
else if(( m_italic->Get3StateValue() != wxCHK_UNDETERMINED
|| m_bold->Get3StateValue() != wxCHK_UNDETERMINED ) )
{
wxString fontName = edaText->GetFontName();
if( !edaText->GetFontName().IsEmpty() )
{
edaText->SetFont( KIFONT::FONT::GetFont( edaText->GetFontName(),
edaText->IsBold(),
edaText->IsItalic() ) );
}
}
if( m_visible->Get3StateValue() != wxCHK_UNDETERMINED )
edaText->SetVisible( m_visible->GetValue() );
} }
if( m_visible->Get3StateValue() != wxCHK_UNDETERMINED && textItem ) if( fpText )
textItem->SetVisible( m_visible->GetValue() ); {
if( m_keepUpright->Get3StateValue() != wxCHK_UNDETERMINED )
if( m_keepUpright->Get3StateValue() != wxCHK_UNDETERMINED && fpTextItem ) fpText->SetKeepUpright( m_keepUpright->GetValue() );
fpTextItem->SetKeepUpright( m_keepUpright->GetValue() ); }
if( !m_lineWidth.IsIndeterminate() ) if( !m_lineWidth.IsIndeterminate() )
{ {
if( drawItem ) if( shape )
{ {
STROKE_PARAMS stroke = drawItem->GetStroke(); STROKE_PARAMS stroke = shape->GetStroke();
stroke.SetWidth( m_lineWidth.GetValue() ); stroke.SetWidth( m_lineWidth.GetValue() );
drawItem->SetStroke( stroke ); shape->SetStroke( stroke );
} }
if( dimension ) if( dimension )
@ -385,21 +403,21 @@ void DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::processItem( BOARD_COMMIT& aCommit, B
{ {
PCB_LAYER_ID layer = aItem->GetLayer(); PCB_LAYER_ID layer = aItem->GetLayer();
if( textItem ) if( edaText )
{ {
textItem->SetTextSize( m_brdSettings->GetTextSize( layer ) ); edaText->SetTextSize( m_brdSettings->GetTextSize( layer ) );
textItem->SetTextThickness( m_brdSettings->GetTextThickness( layer ) ); edaText->SetTextThickness( m_brdSettings->GetTextThickness( layer ) );
textItem->SetItalic( m_brdSettings->GetTextItalic( layer ) ); edaText->SetItalic( m_brdSettings->GetTextItalic( layer ) );
} }
if( fpTextItem ) if( fpText )
fpTextItem->SetKeepUpright( m_brdSettings->GetTextUpright( layer ) ); fpText->SetKeepUpright( m_brdSettings->GetTextUpright( layer ) );
if( drawItem ) if( shape )
{ {
STROKE_PARAMS stroke = drawItem->GetStroke(); STROKE_PARAMS stroke = shape->GetStroke();
stroke.SetWidth( m_brdSettings->GetLineThickness( layer ) ); stroke.SetWidth( m_brdSettings->GetLineThickness( layer ) );
drawItem->SetStroke( stroke ); shape->SetStroke( stroke );
} }
if( dimension ) if( dimension )