sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-07 00:15:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix overlapping text when narrow range is close to top

Browse Source
This commit is contained in:
Nyall Dawson 2024-03-14 14:38:15 +10:00
parent a91f5bf7c2
commit f306e558c6
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/gui/elevation/qgselevationcontrollerwidget.cpp
View File

@ -224,6 +224,7 @@ void QgsElevationControllerLabels::paintEvent( QPaintEvent * )
const bool lowerIsCloseToLimit = lowerY + fm.height() > rect().bottom() - fm.descent(); const bool lowerIsCloseToLimit = lowerY + fm.height() > rect().bottom() - fm.descent();
const bool upperIsCloseToLimit = upperY - fm.height() < rect().top() + fm.ascent(); const bool upperIsCloseToLimit = upperY - fm.height() < rect().top() + fm.ascent();
const bool lowerIsCloseToUpperLimit = lowerY - fm.height() < rect().top() + fm.ascent();
QLocale locale; QLocale locale;
@ -246,17 +247,28 @@ void QgsElevationControllerLabels::paintEvent( QPaintEvent * )
if ( mLimits.upper() < std::numeric_limits< double >::max() ) if ( mLimits.upper() < std::numeric_limits< double >::max() )
{ {
if ( upperIsCloseToLimit ) if ( qgsDoubleNear( mRange.upper(), mRange.lower() ) )
{ {
f.setBold( true ); if ( !lowerIsCloseToUpperLimit )
path.addText( left, upperY, f, locale.toString( mRange.upper() ) ); {
f.setBold( false );
path.addText( left, rect().top() + fm.ascent(), f, locale.toString( mLimits.upper() ) );
}
} }
else else
{ {
f.setBold( true ); if ( upperIsCloseToLimit )
path.addText( left, upperY, f, locale.toString( mRange.upper() ) ); {
f.setBold( false ); f.setBold( true );
path.addText( left, rect().top() + fm.ascent(), f, locale.toString( mLimits.upper() ) ); path.addText( left, upperY, f, locale.toString( mRange.upper() ) );
}
else
{
f.setBold( true );
path.addText( left, upperY, f, locale.toString( mRange.upper() ) );
f.setBold( false );
path.addText( left, rect().top() + fm.ascent(), f, locale.toString( mLimits.upper() ) );
}
} }
} }