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

Do not recalculate center from boundaries when flipping 

Fixes https://gitlab.com/kicad/code/kicad/issues/7304
This commit is contained in:
Mikolaj Wielgus 2021-03-03 01:16:24 +01:00 committed by Seth Hillbrand
parent b9d26a55f2
commit 1e1be730d8
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pcbnew/pcb_text.cpp
View File

@ -167,25 +167,30 @@ void PCB_TEXT::Flip( const wxPoint& aCentre, bool aFlipLeftRight )
int right = box.GetRight(); int right = box.GetRight();
int top = box.GetTop(); int top = box.GetTop();
int bottom = box.GetBottom(); int bottom = box.GetBottom();
wxPoint pos = GetTextPos();
if( aFlipLeftRight ) if( aFlipLeftRight )
{ {
MIRROR( left, aCentre.x ); MIRROR( left, aCentre.x );
MIRROR( right, aCentre.x ); MIRROR( right, aCentre.x );
std::swap( left, right ); std::swap( left, right );
MIRROR( pos.x, aCentre.x );
} }
else else
{ {
MIRROR( top, aCentre.y ); MIRROR( top, aCentre.y );
MIRROR( bottom, aCentre.y ); MIRROR( bottom, aCentre.y );
std::swap( top, bottom ); std::swap( top, bottom );
MIRROR( pos.y, aCentre.y );
} }
// Now put the text back in its bounding box // Now put the text back in its bounding box
switch( GetHorizJustify() ) switch( GetHorizJustify() )
{ {
case GR_TEXT_HJUSTIFY_LEFT: SetTextX( IsMirrored() ? left : right ); break; case GR_TEXT_HJUSTIFY_LEFT: SetTextX( IsMirrored() ? left : right ); break;
case GR_TEXT_HJUSTIFY_CENTER: SetTextX( ( left + right ) / 2 ); break; case GR_TEXT_HJUSTIFY_CENTER: SetTextX( pos.x ); break;
case GR_TEXT_HJUSTIFY_RIGHT: SetTextX( IsMirrored() ? right : left ); break; case GR_TEXT_HJUSTIFY_RIGHT: SetTextX( IsMirrored() ? right : left ); break;
} }
@ -194,7 +199,7 @@ void PCB_TEXT::Flip( const wxPoint& aCentre, bool aFlipLeftRight )
switch( GetVertJustify() ) switch( GetVertJustify() )
{ {
case GR_TEXT_VJUSTIFY_TOP: SetTextY( bottom ); break; case GR_TEXT_VJUSTIFY_TOP: SetTextY( bottom ); break;
case GR_TEXT_VJUSTIFY_CENTER: SetTextY( ( top + bottom ) / 2 ); break; case GR_TEXT_VJUSTIFY_CENTER: SetTextY( pos.y ); break;
case GR_TEXT_VJUSTIFY_BOTTOM: SetTextY( top ); break; case GR_TEXT_VJUSTIFY_BOTTOM: SetTextY( top ); break;
} }
} }