Skip to content
Permalink
Browse files

Merge pull request #514 from mbernasocchi/master

more qreal vs double issues for android
  • Loading branch information
jef-n committed Apr 13, 2013
2 parents 99bf5fa + e3451bb commit 736f765c4a18ddc158328833e0a8f12d76e5e5b4
Showing with 2 additions and 2 deletions.
  1. +2 −2 src/core/composer/qgscomposerlegend.cpp
@@ -377,7 +377,7 @@ QgsComposerLegend::Nucleon QgsComposerLegend::drawSymbolItem( QgsComposerLegendI
if ( painter ) painter->setPen( mFontColor );

//double labelX = point.x() + labelXOffset; // + mIconLabelSpace;
double labelX = point.x() + qMax( symbolSize.width(), labelXOffset );
double labelX = point.x() + qMax( (double) symbolSize.width(), labelXOffset );

// Vertical alignment of label with symbol:
// a) label height < symbol heigh: label centerd with symbol
@@ -410,7 +410,7 @@ QgsComposerLegend::Nucleon QgsComposerLegend::drawSymbolItem( QgsComposerLegendI
nucleon.symbolSize = symbolSize;
nucleon.labelSize = labelSize;
//QgsDebugMsg( QString( "symbol height = %1 label height = %2").arg( symbolSize.height()).arg( labelSize.height() ));
double width = qMax( symbolSize.width(), labelXOffset ) + labelSize.width();
double width = qMax( (double) symbolSize.width(), labelXOffset ) + labelSize.width();
double height = qMax( symbolSize.height(), labelSize.height() );
nucleon.size = QSizeF( width, height );
return nucleon;

0 comments on commit 736f765

Please sign in to comment.
You can’t perform that action at this time.