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

Reconcile SPIN_STYLE and text alignment/rotation controls. 

Fixes https://gitlab.com/kicad/code/kicad/issues/12443
This commit is contained in:
Jeff Young 2022-09-16 19:51:40 +01:00
parent 90bc5c19cf
commit 2aa8facacd
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
eeschema/dialogs/dialog_text_properties.cpp
View File

@ -75,11 +75,17 @@ DIALOG_TEXT_PROPERTIES::DIALOG_TEXT_PROPERTIES( SCH_EDIT_FRAME* aParent, SCH_ITE
else else
{ {
m_hAlignCenter->Show( false ); m_hAlignCenter->Show( false );
m_separator3->Show( false );
m_vAlignTop->Show( false );
m_vAlignCenter->Show( false ); m_vAlignCenter->Show( false );
m_vAlignBottom->Show( false );
wxSizer* parentSizer = m_vAlignTop->GetContainingSizer(); wxSizer* parentSizer = m_vAlignTop->GetContainingSizer();
parentSizer->Detach( m_hAlignCenter ); parentSizer->Detach( m_hAlignCenter );
parentSizer->Detach( m_separator3 );
parentSizer->Detach( m_vAlignTop );
parentSizer->Detach( m_vAlignCenter ); parentSizer->Detach( m_vAlignCenter );
parentSizer->Detach( m_vAlignBottom );
parentSizer->Layout(); parentSizer->Layout();
m_borderCheckbox->Show( false ); m_borderCheckbox->Show( false );
@ -262,19 +268,19 @@ bool DIALOG_TEXT_PROPERTIES::TransferDataToWindow()
switch( static_cast<SCH_TEXT*>( m_currentItem )->GetTextSpinStyle() ) switch( static_cast<SCH_TEXT*>( m_currentItem )->GetTextSpinStyle() )
{ {
case TEXT_SPIN_STYLE::RIGHT: case TEXT_SPIN_STYLE::RIGHT:
m_hAlignRight->Check( true ); m_hAlignLeft->Check( true ); // Spin style to right means text aligned left
m_horizontal->Check( true ); m_horizontal->Check( true );
break; break;
case TEXT_SPIN_STYLE::LEFT: case TEXT_SPIN_STYLE::LEFT:
m_hAlignLeft->Check( true ); m_hAlignRight->Check( true ); // Spin style to left means text aligned right
m_horizontal->Check( true ); m_horizontal->Check( true );
break; break;
case TEXT_SPIN_STYLE::UP: case TEXT_SPIN_STYLE::UP:
m_vAlignTop->Check( true ); m_hAlignLeft->Check( true ); // Spin style up means text aligned to bottom
m_vertical->Check( true ); m_vertical->Check( true );
break; break;
case TEXT_SPIN_STYLE::BOTTOM: case TEXT_SPIN_STYLE::BOTTOM: // Spin style down means text aligned to top
m_vAlignBottom->Check( true ); m_hAlignRight->Check( true );
m_vertical->Check( true ); m_vertical->Check( true );
break; break;
} }
@ -527,14 +533,14 @@ bool DIALOG_TEXT_PROPERTIES::TransferDataFromWindow()
if( m_vertical->IsChecked() ) if( m_vertical->IsChecked() )
textItem->SetTextSpinStyle( TEXT_SPIN_STYLE::BOTTOM ); textItem->SetTextSpinStyle( TEXT_SPIN_STYLE::BOTTOM );
else else
textItem->SetTextSpinStyle( TEXT_SPIN_STYLE::RIGHT ); textItem->SetTextSpinStyle( TEXT_SPIN_STYLE::LEFT );
} }
else else
{ {
if( m_vertical->IsChecked() ) if( m_vertical->IsChecked() )
textItem->SetTextSpinStyle( TEXT_SPIN_STYLE::UP ); textItem->SetTextSpinStyle( TEXT_SPIN_STYLE::UP );
else else
textItem->SetTextSpinStyle( TEXT_SPIN_STYLE::LEFT ); textItem->SetTextSpinStyle( TEXT_SPIN_STYLE::RIGHT );
} }
} }
else else