Showing with 15 additions and 1 deletion.
  1. +9 −1 src/core/composer/qgscomposerhtml.cpp
  2. +6 −0 src/core/composer/qgscomposermap.cpp
10 changes: 9 additions & 1 deletion src/core/composer/qgscomposerhtml.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,18 @@ bool QgsComposerHtml::writeXML( QDomElement& elem, QDomDocument & doc, bool igno
bool QgsComposerHtml::readXML( const QDomElement& itemElem, const QDomDocument& doc, bool ignoreFrames )
{
deleteFrames();

//first create the frames
if ( !_readXML( itemElem, doc, ignoreFrames ) )
{
return false;
}

//then load the set url
QString urlString = itemElem.attribute( "url" );
if ( !urlString.isEmpty() )
{
setUrl( QUrl( urlString ) );
}
return _readXML( itemElem, doc, ignoreFrames );
return true;
}
6 changes: 6 additions & 0 deletions src/core/composer/qgscomposermap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@ QgsComposerMap::QgsComposerMap( QgsComposition *composition, int x, int y, int w
mGridAnnotationFont.setFamily( defaultFontString );
}

//get the color for map canvas background and set map background color accordingly
int bgRedInt = QgsProject::instance()->readNumEntry( "Gui", "/CanvasColorRedPart", 255 );
int bgGreenInt = QgsProject::instance()->readNumEntry( "Gui", "/CanvasColorGreenPart", 255 );
int bgBlueInt = QgsProject::instance()->readNumEntry( "Gui", "/CanvasColorBluePart", 255 );
mBackgroundColor = QColor( bgRedInt, bgGreenInt, bgBlueInt );

connectUpdateSlot();

//calculate mExtent based on width/height ratio and map canvas extent
Expand Down