Commit dde43cfd authored by Torsten Rahn's avatar Torsten Rahn
Browse files

Backport of 
SVN commit 1082256 by rahn:


- Fix black rectangle behind the big blue Marble
- Make stars reappear in the corners.



svn path=/branches/KDE/4.4/kdeedu/marble/; revision=1082258
parent b7a8e7d2
......@@ -135,15 +135,22 @@ void MarbleMapPrivate::doResize()
{
QSize size(m_parent->width(), m_parent->height());
m_viewParams.viewport()->setSize( size );
// If the globe covers fully the screen then we can use the faster
// RGB32 as there are no translucent areas involved.
QImage::Format imageFormat = ( m_parent->mapCoversViewport() )
? QImage::Format_RGB32
: QImage::Format_ARGB32_Premultiplied;
// Recreate the canvas image with the new size.
m_viewParams.setCanvasImage( new QImage( m_parent->width(), m_parent->height(),
QImage::Format_RGB32 ));
imageFormat ));
if ( m_viewParams.showAtmosphere() ) {
m_dirtyAtmosphere=true;
}
// Recreate the
// Recreate the coastline detection offscreen image
m_viewParams.setCoastImage( new QImage( m_parent->width(), m_parent->height(),
QImage::Format_RGB32 ));
......
......@@ -847,8 +847,13 @@ void MarbleWidget::paintEvent(QPaintEvent *evt)
QImage image;
if (!isEnabled())
{
// If the globe covers fully the screen then we can use the faster
// RGB32 as there are no translucent areas involved.
QImage::Format imageFormat = ( map()->mapCoversViewport() )
? QImage::Format_RGB32
: QImage::Format_ARGB32_Premultiplied;
// Paint to an intermediate image
image = QImage(rect().size(), QImage::Format_ARGB32_Premultiplied);
image = QImage(rect().size(), imageFormat);
paintDevice = ℑ
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment