48 lines
2.6 KiB
Diff
48 lines
2.6 KiB
Diff
diff -rupN qgis-2.6.0/src/core/composer/qgscomposerhtml.cpp qgis-2.6.0-new/src/core/composer/qgscomposerhtml.cpp
|
|
--- qgis-2.6.0/src/core/composer/qgscomposerhtml.cpp 2014-10-31 15:17:19.000000000 +0100
|
|
+++ qgis-2.6.0-new/src/core/composer/qgscomposerhtml.cpp 2014-11-12 14:22:46.152730089 +0100
|
|
@@ -233,7 +233,7 @@ double QgsComposerHtml::maxFrameWidth()
|
|
QList<QgsComposerFrame*>::const_iterator frameIt = mFrameItems.constBegin();
|
|
for ( ; frameIt != mFrameItems.constEnd(); ++frameIt )
|
|
{
|
|
- maxWidth = qMax( maxWidth, ( *frameIt )->boundingRect().width() );
|
|
+ maxWidth = qMax( maxWidth, ( double ) ( ( *frameIt )->boundingRect().width() ) );
|
|
}
|
|
|
|
return maxWidth;
|
|
diff -rupN qgis-2.6.0/src/core/layertree/qgslayertreemodellegendnode.cpp qgis-2.6.0-new/src/core/layertree/qgslayertreemodellegendnode.cpp
|
|
--- qgis-2.6.0/src/core/layertree/qgslayertreemodellegendnode.cpp 2014-10-31 15:17:19.000000000 +0100
|
|
+++ qgis-2.6.0-new/src/core/layertree/qgslayertreemodellegendnode.cpp 2014-11-12 14:20:59.325919209 +0100
|
|
@@ -62,7 +62,7 @@ QgsLayerTreeModelLegendNode::ItemMetrics
|
|
// itemHeight here is not realy item height, it is only for symbol
|
|
// vertical alignment purpose, i.e. ok take single line height
|
|
// if there are more lines, thos run under the symbol
|
|
- double itemHeight = qMax( settings.symbolSize().height(), textHeight );
|
|
+ double itemHeight = qMax( ( double ) settings.symbolSize().height(), textHeight );
|
|
|
|
ItemMetrics im;
|
|
im.symbolSize = drawSymbol( settings, ctx, itemHeight );
|
|
@@ -334,8 +334,8 @@ QSizeF QgsSymbolV2LegendNode::drawSymbol
|
|
p->restore();
|
|
}
|
|
|
|
- return QSizeF( qMax( width + 2 * widthOffset, settings.symbolSize().width() ),
|
|
- qMax( height + 2 * heightOffset, settings.symbolSize().height() ) );
|
|
+ return QSizeF( qMax( width + 2 * widthOffset, ( double ) settings.symbolSize().width() ),
|
|
+ qMax( height + 2 * heightOffset, ( double ) settings.symbolSize().height() ) );
|
|
}
|
|
|
|
|
|
diff -rupN qgis-2.6.0/src/core/qgslegendrenderer.cpp qgis-2.6.0-new/src/core/qgslegendrenderer.cpp
|
|
--- qgis-2.6.0/src/core/qgslegendrenderer.cpp 2014-10-31 15:17:19.000000000 +0100
|
|
+++ qgis-2.6.0-new/src/core/qgslegendrenderer.cpp 2014-11-12 14:21:35.895213582 +0100
|
|
@@ -375,7 +375,7 @@ QSizeF QgsLegendRenderer::drawTitle( QPa
|
|
switch ( halignment )
|
|
{
|
|
case Qt::AlignHCenter:
|
|
- textBoxWidth = ( qMin( point.x(), legendWidth - point.x() ) - mSettings.boxSpace() ) * 2.0;
|
|
+ textBoxWidth = ( qMin( ( double ) point.x(), legendWidth - point.x() ) - mSettings.boxSpace() ) * 2.0;
|
|
textBoxLeft = point.x() - textBoxWidth / 2.;
|
|
break;
|
|
case Qt::AlignRight:
|