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

Tighten corner radius value clearing.

Browse Source 
Move loading of values outside of c'tor (where
they get stomped on my dialog restore code).

Fixes https://gitlab.com/kicad/code/kicad/-/issues/21677
This commit is contained in:
Jeff Young 2025-09-08 17:28:03 +01:00
parent 0b102fc085
commit adbc80aade
1 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
pcbnew/dialogs/dialog_shape_properties.cpp
View File

@ -706,11 +706,12 @@ public:
}
};
class DIALOG_SHAPE_PROPERTIES : public DIALOG_SHAPE_PROPERTIES_BASE
{
public:
DIALOG_SHAPE_PROPERTIES( PCB_BASE_EDIT_FRAME* aParent, PCB_SHAPE* aShape );
~DIALOG_SHAPE_PROPERTIES() {};
~DIALOG_SHAPE_PROPERTIES() override = default;
private:
bool TransferDataToWindow() override;
@ -1029,20 +1030,6 @@ DIALOG_SHAPE_PROPERTIES::DIALOG_SHAPE_PROPERTIES( PCB_BASE_EDIT_FRAME* aParent,
m_netLabel->Hide();
m_netSelector->Hide();
}
else
{
int net = aShape->GetNetCode();
if( net >= 0 )
{
m_netSelector->SetSelectedNetcode( net );
}
else
{
m_netSelector->SetIndeterminateString( INDETERMINATE_STATE );
m_netSelector->SetIndeterminate();
}
}
if( m_item->GetShape() == SHAPE_T::ARC
|| m_item->GetShape() == SHAPE_T::SEGMENT
@ -1076,14 +1063,14 @@ void PCB_BASE_EDIT_FRAME::ShowGraphicItemPropertiesDialog( PCB_SHAPE* aShape )
}
void DIALOG_SHAPE_PROPERTIES::onRoundedRectChanged(wxCommandEvent &event)
void DIALOG_SHAPE_PROPERTIES::onRoundedRectChanged( wxCommandEvent &event )
{
if( !m_cbRoundRect->GetValue() )
m_cornerRadius.ChangeValue( wxEmptyString );
}
void DIALOG_SHAPE_PROPERTIES::onCornerRadius(wxCommandEvent &event)
void DIALOG_SHAPE_PROPERTIES::onCornerRadius( wxCommandEvent &event )
{
m_cbRoundRect->SetValue( true );
}
@ -1118,8 +1105,16 @@ bool DIALOG_SHAPE_PROPERTIES::TransferDataToWindow()
if( m_item->GetShape() == SHAPE_T::RECTANGLE )
{
m_cbRoundRect->SetValue( m_item->GetCornerRadius() > 0 );
m_cornerRadius.ChangeValue( m_item->GetCornerRadius() );
if( m_item->GetCornerRadius() > 0 )
{
m_cbRoundRect->SetValue( true );
m_cornerRadius.ChangeValue( m_item->GetCornerRadius() );
}
else
{
m_cbRoundRect->SetValue( false );
m_cornerRadius.ChangeValue( wxEmptyString );
}
}
m_thickness.SetValue( m_item->GetStroke().GetWidth() );
@ -1140,6 +1135,21 @@ bool DIALOG_SHAPE_PROPERTIES::TransferDataToWindow()
else
m_solderMaskMargin.SetValue( wxEmptyString );
if( m_parent->GetFrameType() == FRAME_PCB_EDITOR )
{
int net = m_item->GetNetCode();
if( net >= 0 )
{
m_netSelector->SetSelectedNetcode( net );
}
else
{
m_netSelector->SetIndeterminateString( INDETERMINATE_STATE );
m_netSelector->SetIndeterminate();
}
}
enableNetInfo();
enableTechLayers();
@ -1248,7 +1258,7 @@ bool DIALOG_SHAPE_PROPERTIES::Validate()
int shortSide = std::min( m_item->GetRectangleWidth(), m_item->GetRectangleHeight() );
if( m_cornerRadius.GetIntValue() * 2 > shortSide )
if( m_cbRoundRect->GetValue() && m_cornerRadius.GetIntValue() * 2 > shortSide )
{
errors.Add( _( "Corner radius must be less than or equal to half the smaller side." ) );
m_cornerRadius.SetValue( KiROUND( shortSide / 2.0 ) );