mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-25 09:04:39 +03:00
Code

Finish 1.4.78

Browse Source
This commit is contained in:
Arin Alex 2018-04-20 00:10:24 +03:00
commit b9774f62fb
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common.pri
View File

@ -62,7 +62,7 @@ RCC_DIR = $${ARCH_DIR}/$${BUILD_TYPE}/rcc
LIMEREPORT_VERSION_MAJOR = 1 LIMEREPORT_VERSION_MAJOR = 1
LIMEREPORT_VERSION_MINOR = 4 LIMEREPORT_VERSION_MINOR = 4
LIMEREPORT_VERSION_RELEASE = 77 LIMEREPORT_VERSION_RELEASE = 78
LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"' LIMEREPORT_VERSION = '\\"$${LIMEREPORT_VERSION_MAJOR}.$${LIMEREPORT_VERSION_MINOR}.$${LIMEREPORT_VERSION_RELEASE}\\"'
DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\" DEFINES += LIMEREPORT_VERSION_STR=\"$${LIMEREPORT_VERSION}\"

10
limereport/lrbasedesignintf.cpp
View File

@ -400,19 +400,21 @@ void BaseDesignIntf::prepareRect(QPainter *painter, const QStyleOptionGraphicsIt
{ {
painter->save(); painter->save();
QRectF r = rect().adjusted(0, 0, borderLineSize(), borderLineSize());
QBrush brush(m_backgroundColor,static_cast<Qt::BrushStyle>(m_backgroundBrushStyle)); QBrush brush(m_backgroundColor,static_cast<Qt::BrushStyle>(m_backgroundBrushStyle));
brush.setTransform(painter->worldTransform().inverted()); brush.setTransform(painter->worldTransform().inverted());
if (isSelected() && (opacity() == 100) && (m_BGMode!=TransparentMode)) { if (isSelected() && (opacity() == 100) && (m_BGMode!=TransparentMode)) {
painter->fillRect(rect(), brush); painter->fillRect(r, brush);
} }
else { else {
if (m_BGMode == OpaqueMode) { if (m_BGMode == OpaqueMode) {
painter->setOpacity(qreal(m_opacity) / 100); qreal o = (itemMode() & DesignMode) ? 0.5 : qreal(m_opacity) / 100;
painter->fillRect(rect(), brush); painter->setOpacity(o);
painter->fillRect(r, brush);
} else if (itemMode() & DesignMode){ } else if (itemMode() & DesignMode){
painter->setOpacity(0.1); painter->setOpacity(0.1);
painter->fillRect(rect(), QBrush(QPixmap(":/report/images/empty"))); painter->fillRect(r, QBrush(QPixmap(":/report/images/empty")));
} }
} }
painter->restore(); painter->restore();