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

Merge branch 'fix-text-bold-thickness-v2-18975' into 'master'

Browse Source 
Draft: Fix for ensuring thickness reverts only when the user manually sets it.

Closes #18975

See merge request kicad/code/kicad!2182
This commit is contained in:
Dhineshkumar S 2025-09-13 14:38:56 +00:00
commit 29ce09fae8
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
common/eda_text.cpp
View File

@ -285,6 +285,18 @@ void EDA_TEXT::CopyText( const EDA_TEXT& aSrc )
void EDA_TEXT::SetTextThickness( int aWidth ) void EDA_TEXT::SetTextThickness( int aWidth )
{ {
m_attributes.m_StrokeWidth = aWidth; m_attributes.m_StrokeWidth = aWidth;
const int size = std::min( m_attributes.m_Size.x, m_attributes.m_Size.y );
// Identifies whether the user manually entered a thickness value.
// If the value is manually set (not matching the system-calculated bold pen size), store it.
// Otherwise, set it to -1, indicating that no manual value should be retained when toggling bold/unbold.
if( ( aWidth < GetPenSizeForBold( size ) && aWidth != GetPenSizeForNormal( size ) )
|| aWidth > GetPenSizeForBold( size ) )
m_attributes.m_StoredStrokeWidth = aWidth;
else
m_attributes.m_StoredStrokeWidth = -1;
ClearRenderCache(); ClearRenderCache();
ClearBoundingBoxCache(); ClearBoundingBoxCache();
} }
@ -346,23 +358,23 @@ void EDA_TEXT::SetBold( bool aBold )
if( aBold ) if( aBold )
{ {
m_attributes.m_StoredStrokeWidth = m_attributes.m_StrokeWidth; // If the user manually set a stroke width greater than the system-calculated bold pen size,
m_attributes.m_StrokeWidth = GetPenSizeForBold( size ); // use the manually set stroke width instead of the default bold stroke width.
if( m_attributes.m_StoredStrokeWidth > 0
&& m_attributes.m_StoredStrokeWidth > GetPenSizeForBold( size ) )
m_attributes.m_StrokeWidth = m_attributes.m_StoredStrokeWidth;
else
m_attributes.m_StrokeWidth = GetPenSizeForBold( size );
} }
else else
{ {
// Restore the original stroke width from `m_StoredStrokeWidth` if it was // If the user manually set a stroke width smaller than the system-calculated bold pen size,
// previously stored, resetting the width after unbolding. // use the manually set stroke width instead of the default unbold stroke width.
if( m_attributes.m_StoredStrokeWidth ) if( m_attributes.m_StoredStrokeWidth >= 0
&& m_attributes.m_StoredStrokeWidth < GetPenSizeForBold( size ) )
m_attributes.m_StrokeWidth = m_attributes.m_StoredStrokeWidth; m_attributes.m_StrokeWidth = m_attributes.m_StoredStrokeWidth;
else else
{
m_attributes.m_StrokeWidth = GetPenSizeForNormal( size ); m_attributes.m_StrokeWidth = GetPenSizeForNormal( size );
// Sets `m_StrokeWidth` to the normal pen size and stores it in
// `m_StoredStrokeWidth` as the default, but only if the bold option was
// applied before this feature was implemented.
m_attributes.m_StoredStrokeWidth = m_attributes.m_StrokeWidth;
}
} }
} }
else else