sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-16 00:03:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

[layouts] Fix incorrectly rendered item background and frame when item is

Browse Source 
non-opaque

Fixes #20909
This commit is contained in:
Nyall Dawson 2019-01-08 15:18:10 +10:00
parent 4da0796180
commit 0de94dd1fe
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/layout/qgslayoutitem.cpp
View File

@ -325,11 +325,16 @@ void QgsLayoutItem::paint( QPainter *painter, const QStyleOptionGraphicsItem *it
// painter is already scaled to dots // painter is already scaled to dots
// need to translate so that item origin is at 0,0 in painter coordinates (not bounding rect origin) // need to translate so that item origin is at 0,0 in painter coordinates (not bounding rect origin)
p.translate( -boundingRect().x() * context.scaleFactor(), -boundingRect().y() * context.scaleFactor() ); p.translate( -boundingRect().x() * context.scaleFactor(), -boundingRect().y() * context.scaleFactor() );
// scale to layout units for background and frame rendering
p.scale( context.scaleFactor(), context.scaleFactor() );
drawBackground( context ); drawBackground( context );
p.scale( 1 / context.scaleFactor(), 1 / context.scaleFactor() );
double viewScale = QgsLayoutUtils::scaleFactorFromItemStyle( itemStyle ); double viewScale = QgsLayoutUtils::scaleFactorFromItemStyle( itemStyle );
QgsLayoutItemRenderContext itemRenderContext( context, viewScale ); QgsLayoutItemRenderContext itemRenderContext( context, viewScale );
draw( itemRenderContext ); draw( itemRenderContext );
p.scale( context.scaleFactor(), context.scaleFactor() );
drawFrame( context ); drawFrame( context );
p.scale( 1 / context.scaleFactor(), 1 / context.scaleFactor() );
p.end(); p.end();
QgsImageOperation::multiplyOpacity( image, mEvaluatedOpacity ); QgsImageOperation::multiplyOpacity( image, mEvaluatedOpacity );

16
tests/src/core/testqgslayoutitem.cpp
View File

@ -24,6 +24,7 @@
#include "qgsreadwritecontext.h" #include "qgsreadwritecontext.h"
#include "qgslayoutitemundocommand.h" #include "qgslayoutitemundocommand.h"
#include "qgslayoutitemmap.h" #include "qgslayoutitemmap.h"
#include "qgslayoutitemlabel.h"
#include "qgslayoutitemshape.h" #include "qgslayoutitemshape.h"
#include "qgslayouteffect.h" #include "qgslayouteffect.h"
#include "qgsfillsymbollayer.h" #include "qgsfillsymbollayer.h"
@ -1979,6 +1980,21 @@ void TestQgsLayoutItem::opacity()
checker.setControlPathPrefix( QStringLiteral( "composer_effects" ) ); checker.setControlPathPrefix( QStringLiteral( "composer_effects" ) );
QVERIFY( checker.testLayout( mReport ) ); QVERIFY( checker.testLayout( mReport ) );
// with background and frame
l.removeLayoutItem( item );
QgsLayoutItemLabel *labelItem = new QgsLayoutItemLabel( &l );
l.addLayoutItem( labelItem );
labelItem->attemptSetSceneRect( QRectF( 50, 50, 150, 100 ) );
labelItem->setBackgroundEnabled( true );
labelItem->setBackgroundColor( QColor( 40, 140, 240 ) );
labelItem->setFrameEnabled( true );
labelItem->setFrameStrokeColor( QColor( 40, 30, 20 ) );
labelItem->setItemOpacity( 0.5 );
checker = QgsLayoutChecker( QStringLiteral( "composereffects_transparency_bgframe" ), &l );
checker.setControlPathPrefix( QStringLiteral( "composer_effects" ) );
QVERIFY( checker.testLayout( mReport ) );
QgsLayout l2( QgsProject::instance() ); QgsLayout l2( QgsProject::instance() );
l2.initializeDefaults(); l2.initializeDefaults();
QgsLayoutItemShape *mComposerRect1 = new QgsLayoutItemShape( &l2 ); QgsLayoutItemShape *mComposerRect1 = new QgsLayoutItemShape( &l2 );

BIN
tests/testdata/control_images/composer_effects/expected_composereffects_transparency_bgframe/expected_composereffects_transparency_bgframe.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB