removed hardcoded font size from graphs - now it's 1 smaller then default one

it would be nice to get _pCfg->getUseSmallFont here like it is done for lists

1 files changed, 4 insertions, 2 deletions

diff --git a/noncore/apps/checkbook/graph.cpp b/noncore/apps/checkbook/graph.cpp
index 72da738..279285a 100644
--- a/noncore/apps/checkbook/graph.cpp
+++ b/noncore/apps/checkbook/graph.cpp
@@ -52,122 +52,124 @@ void Graph::drawGraph( bool regen )
 	{
 		initGraph();
 	}
 	QPainter p( this );
 	p.drawPixmap( 0, 0, graph );
 }
 
 void Graph::paintEvent( QPaintEvent * )
 {
 	drawGraph( FALSE );
 }
 
 void Graph::resizeEvent( QResizeEvent * )
 {
 	drawGraph( TRUE );
 }
 
 void Graph::initGraph()
 {
 	graph.resize( width(), height() );
 	graph.fill( QColor( 255, 255, 255 ) );
 
 	if ( !data )
 	{
 		return;
 	}
 
 	// Any common stuff here (titles, ???)
 
 	switch ( data->graphType() )
 	{
 		case GraphInfo::BarChart :
 		{
 			drawBarChart( width(), height(), data->maxValue(), data->minValue() );
 		}
 		break;
 		case GraphInfo::PieChart :
 		{
 			drawPieChart( width(), height(), data->totalValue() );
 		}
 	};
 }
 
 void Graph::drawBarChart( int width, int height, float max, float min )
 {
 	QPainter p( &graph );
 
 	// Try to set the font size smaller for text
+	// it would be nice to get _pCfg->getUseSmallFont here
 	QFont f = font();
-	f.setPointSize( 8 );
+	f.setPointSize( f.pointSize()-1 );
 	p.setFont( f );
 
 	int x = 0;
 	int i = 0;
 	int n = data->numberDataPoints();
 	QFontMetrics fm=fontMetrics();
 	int fh = fm.height();
 	int fw;
 
 	QColor c( 0, 0, 255);
 	p.setBrush( c );
 
     if ( min > 0 )
         min = 0.0;
 
 	int bw = ( width - width / 4 ) / n;
     int hoffset =  int( ( height - height / 4 - 1 ) * ( min * -1 ) / ( max - min ) );
 	for (DataPointInfo *dp = data->firstDataPoint(); dp; dp = data->nextDataPoint() )
 	{
         int bh = int( ( height - height / 4 - 1 ) * dp->value() / ( max - min ) );
 		p.drawRect( width / 8 + x, height - height / 8 - 1 - hoffset - bh, bw, bh );
 		fw = fm.width( dp->label() );
 		p.drawText( width / 8 + x - fw / 2 + bw / 2, height - height / 8 - hoffset, fw,
 					fh + height / 8, AlignTop | AlignHCenter, dp->label() );
 		i++;
 		x += bw;
 	}
 }
 
 void Graph::drawPieChart( int width, int height, float sum )
 {
 	QPainter p( &graph );
 
 	// Try to set the font size smaller for text
+	// it would be nice to get _pCfg->getUseSmallFont here
 	QFont f = font();
-	f.setPointSize( 8 );
+	f.setPointSize( f.pointSize()-1 );
 	p.setFont( f );
 
 	int n = data->numberDataPoints();
 
 	int apos = -90 * 16;
 
 	int xd = width - width / 5;
 	int yd = height - height / 5;
 
 	int i = 0;
 
 	QColor c;
 
 	for (DataPointInfo *dp = data->firstDataPoint(); dp; dp = data->nextDataPoint() )
 	{
 		c.setHsv( ( i *255) / n, 255, 255 );
 		p.setBrush( c );
 
 		int a = int( ( dp->value() * 360.0 ) / sum * 16.0 + 0.5 );
 		p.drawPie( width/10, height/10, xd, yd, -apos, -a );
 		apos += a;
 		i++;
 	}
 
 	double apos2 = -90 * 3.14159 / 180;
 	for (DataPointInfo *dp = data->firstDataPoint(); dp; dp = data->nextDataPoint() )
 	{
 		double a = dp->value() *360 / sum * 3.14159 / 180;
 		int x = int( cos( apos2 + a/2 ) * width * 5/16 + width/2 + 0.5 );
 		int y = int( sin( apos2 + a/2 ) * height * 5/16 + height/2 + 0.5 );
 		p.drawText( x - width/8, y - height/8, width/4, height/4, WordBreak | AlignCenter,
 					dp->label() );
 		apos2 += a;
 	}
 }