diff options
author | Tomaz Canabrava <tomaz.canabrava@intel.com> | 2014-06-19 18:45:26 -0300 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2014-06-20 15:43:10 -0700 |
commit | be462ae1a61312fd6b625e00e35c1622bc006f41 (patch) | |
tree | c8f52191c606084ea516b97fef5a4325e87ab663 | |
parent | f3f03e2ee89a55947a10c2a08ebf6dfa49a393b0 (diff) | |
download | subsurface-be462ae1a6.tar.gz |
Change the Star Widget to use QImage instead of QPixmap
Also, clean a few calls, this should make the widget a tiny
bit faster. This patch also moves the grayImage function from
the star widget to the global scope, so I can use it on the
Calendar widget.
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r-- | qt-ui/modeldelegates.cpp | 7 | ||||
-rw-r--r-- | qt-ui/simplewidgets.cpp | 3 | ||||
-rw-r--r-- | qt-ui/simplewidgets.h | 1 | ||||
-rw-r--r-- | qt-ui/starwidget.cpp | 35 | ||||
-rw-r--r-- | qt-ui/starwidget.h | 9 |
5 files changed, 30 insertions, 25 deletions
diff --git a/qt-ui/modeldelegates.cpp b/qt-ui/modeldelegates.cpp index d06c6621f..dc6af5665 100644 --- a/qt-ui/modeldelegates.cpp +++ b/qt-ui/modeldelegates.cpp @@ -47,10 +47,13 @@ void StarWidgetsDelegate::paint(QPainter *painter, const QStyleOptionViewItem &o int deltaY = option.rect.height() / 2 - StarWidget::starActive().height() / 2; painter->save(); painter->setRenderHint(QPainter::Antialiasing, true); + const QPixmap active = QPixmap::fromImage(StarWidget::starActive()); + const QPixmap inactive = QPixmap::fromImage(StarWidget::starInactive()); + for (int i = 0; i < rating; i++) - painter->drawPixmap(option.rect.x() + i * IMG_SIZE + SPACING, option.rect.y() + deltaY, StarWidget::starActive()); + painter->drawPixmap(option.rect.x() + i * IMG_SIZE + SPACING, option.rect.y() + deltaY, active); for (int i = rating; i < TOTALSTARS; i++) - painter->drawPixmap(option.rect.x() + i * IMG_SIZE + SPACING, option.rect.y() + deltaY, StarWidget::starInactive()); + painter->drawPixmap(option.rect.x() + i * IMG_SIZE + SPACING, option.rect.y() + deltaY, inactive); painter->restore(); } diff --git a/qt-ui/simplewidgets.cpp b/qt-ui/simplewidgets.cpp index ebb19bd8b..5fb9308fd 100644 --- a/qt-ui/simplewidgets.cpp +++ b/qt-ui/simplewidgets.cpp @@ -332,7 +332,8 @@ void DateWidget::paintEvent(QPaintEvent *event) static int pixRedTag = 18; /* calculated using a ruler. */ QPainter painter(this); - painter.drawPixmap(QPoint(0,0), pix); + + painter.drawPixmap(QPoint(0,0), isEnabled() ? pix : QPixmap::fromImage(grayImage(pix.toImage()))); QString month = mDate.toString("MMM"); QString year = mDate.toString("yyyy"); diff --git a/qt-ui/simplewidgets.h b/qt-ui/simplewidgets.h index 6587c2739..b8cb8aed4 100644 --- a/qt-ui/simplewidgets.h +++ b/qt-ui/simplewidgets.h @@ -111,5 +111,6 @@ private: }; bool isGnome3Session(); +QImage grayImage(const QImage& coloredImg); #endif // SIMPLEWIDGETS_H diff --git a/qt-ui/starwidget.cpp b/qt-ui/starwidget.cpp index ff185a4a0..c682d95e3 100644 --- a/qt-ui/starwidget.cpp +++ b/qt-ui/starwidget.cpp @@ -7,18 +7,19 @@ #include <unistd.h> #include <QStyle> #include <QStyleOption> +#include "simplewidgets.h" -QPixmap *StarWidget::activeStar = 0; -QPixmap *StarWidget::inactiveStar = 0; +QImage StarWidget::activeStar; +QImage StarWidget::inactiveStar; -QPixmap StarWidget::starActive() +const QImage& StarWidget::starActive() { - return (*activeStar); + return activeStar; } -QPixmap StarWidget::starInactive() +const QImage& StarWidget::starInactive() { - return (*inactiveStar); + return inactiveStar; } int StarWidget::currentStars() const @@ -48,12 +49,14 @@ void StarWidget::mouseReleaseEvent(QMouseEvent *event) void StarWidget::paintEvent(QPaintEvent *event) { QPainter p(this); + QPixmap active = QPixmap::fromImage(starActive()); + QPixmap inactive = QPixmap::fromImage(starInactive()); for (int i = 0; i < current; i++) - p.drawPixmap(i * IMG_SIZE + SPACING, 0, starActive()); + p.drawPixmap(i * IMG_SIZE + SPACING, 0, active); for (int i = current; i < TOTALSTARS; i++) - p.drawPixmap(i * IMG_SIZE + SPACING, 0, starInactive()); + p.drawPixmap(i * IMG_SIZE + SPACING, 0, inactive); if (hasFocus()) { QStyleOptionFocusRect option; @@ -74,8 +77,7 @@ StarWidget::StarWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, f), current(0), readOnly(false) { - if (!activeStar) { - activeStar = new QPixmap(); + if (activeStar.isNull()) { QSvgRenderer render(QString(":star")); QPixmap renderedStar(IMG_SIZE, IMG_SIZE); @@ -83,18 +85,17 @@ StarWidget::StarWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, f), QPainter painter(&renderedStar); render.render(&painter, QRectF(0, 0, IMG_SIZE, IMG_SIZE)); - (*activeStar) = renderedStar; + activeStar = renderedStar.toImage(); } - if (!inactiveStar) { - inactiveStar = new QPixmap(); - (*inactiveStar) = grayImage(activeStar); + if (inactiveStar.isNull()) { + inactiveStar = grayImage(activeStar); } setFocusPolicy(Qt::StrongFocus); } -QPixmap StarWidget::grayImage(QPixmap *coloredImg) +QImage grayImage(const QImage& coloredImg) { - QImage img = coloredImg->toImage(); + QImage img = coloredImg; for (int i = 0; i < img.width(); ++i) { for (int j = 0; j < img.height(); ++j) { QRgb rgb = img.pixel(i, j); @@ -107,7 +108,7 @@ QPixmap StarWidget::grayImage(QPixmap *coloredImg) } } - return QPixmap::fromImage(img); + return img; } QSize StarWidget::sizeHint() const diff --git a/qt-ui/starwidget.h b/qt-ui/starwidget.h index 79b01c951..3103a43eb 100644 --- a/qt-ui/starwidget.h +++ b/qt-ui/starwidget.h @@ -17,8 +17,8 @@ public: /*reimp*/ QSize sizeHint() const; - static QPixmap starActive(); - static QPixmap starInactive(); + static const QImage& starActive(); + static const QImage& starInactive(); signals: void valueChanged(int stars); @@ -39,9 +39,8 @@ private: int current; bool readOnly; - static QPixmap *activeStar; - static QPixmap *inactiveStar; - QPixmap grayImage(QPixmap *coloredImg); + static QImage activeStar; + static QImage inactiveStar; }; #endif // STARWIDGET_H |