From bb6e934152bfb89b3e0bdb3f666f6e7c3570c516 Mon Sep 17 00:00:00 2001 From: Arin Alex Date: Tue, 1 Nov 2016 22:31:48 +0300 Subject: [PATCH] Band background color has been fixed --- limereport/lrbanddesignintf.cpp | 5 ++++- limereport/lrbasedesignintf.cpp | 2 +- limereport/lrbasedesignintf.h | 8 ++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/limereport/lrbanddesignintf.cpp b/limereport/lrbanddesignintf.cpp index 9f5be63..c7939d8 100644 --- a/limereport/lrbanddesignintf.cpp +++ b/limereport/lrbanddesignintf.cpp @@ -741,7 +741,10 @@ void BandDesignIntf::childBandDeleted(QObject *band) QColor BandDesignIntf::alternateBackgroundColor() const { - return m_alternateBackgroundColor; + if (metaObject()->indexOfProperty("alternateBackgroundColor")!=-1) + return m_alternateBackgroundColor; + else + return backgroundColor(); } void BandDesignIntf::setAlternateBackgroundColor(const QColor &alternateBackgroundColor) diff --git a/limereport/lrbasedesignintf.cpp b/limereport/lrbasedesignintf.cpp index 41c64dc..8b632d5 100644 --- a/limereport/lrbasedesignintf.cpp +++ b/limereport/lrbasedesignintf.cpp @@ -117,7 +117,7 @@ void BaseDesignIntf::setParentReportItem(const QString &value) } } -QString BaseDesignIntf::parentReportItemName() +QString BaseDesignIntf::parentReportItemName() const { BaseDesignIntf *parent = dynamic_cast(parentItem()); if (parent) return parent->objectName(); diff --git a/limereport/lrbasedesignintf.h b/limereport/lrbasedesignintf.h index 28f0960..f31bf73 100644 --- a/limereport/lrbasedesignintf.h +++ b/limereport/lrbasedesignintf.h @@ -124,18 +124,18 @@ public: virtual ~BaseDesignIntf(); void setParentReportItem(const QString& value); - QString parentReportItemName(); + QString parentReportItemName() const; - BrushMode backgroundBrushMode(){return m_backgroundBrush;} + BrushMode backgroundBrushMode() const {return m_backgroundBrush;} void setBackgroundBrushMode(BrushMode value); - QColor backgroundColor(){return m_backgroundBrushcolor;} + QColor backgroundColor() const {return m_backgroundBrushcolor;} void setBackgroundColor(QColor value); QPen pen() const; void setPen(QPen& pen); QFont font() const; void setFont(QFont& font); - QColor fontColor(){return m_fontColor;} + QColor fontColor() const {return m_fontColor;} void setFontColor(QColor value){m_fontColor=value;} virtual BGMode backgroundMode() const;