From 2f064bf7a09ee2b7af14237cd0588a5daf18610a Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Sat, 22 May 2010 20:13:57 +0000 Subject: [PATCH] simplify monitor overlay info svn path=/trunk/kdenlive/; revision=4472 --- src/monitor.cpp | 21 ++++++++------------- src/monitor.h | 1 - 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/monitor.cpp b/src/monitor.cpp index a550944f..5a88b826 100644 --- a/src/monitor.cpp +++ b/src/monitor.cpp @@ -873,26 +873,21 @@ Overlay::Overlay(QWidget* parent) : QLabel(parent) { setAttribute(Qt::WA_TransparentForMouseEvents); - setAttribute(Qt::WA_OpaquePaintEvent); + //setAttribute(Qt::WA_OpaquePaintEvent); //setAttribute(Qt::WA_NoSystemBackground); - setAutoFillBackground(false); -} - -void Overlay::paintEvent(QPaintEvent * /*event*/) -{ - QPainter painter(this); - QColor col; - painter.setPen(Qt::white); - if (m_isZone) col = QColor(200, 0, 0); - else col = QColor(0, 0, 200); - painter.fillRect(rect(), col); - painter.drawText(rect(), Qt::AlignCenter, text()); + setAutoFillBackground(true); + setBackgroundRole(QPalette::Base); } void Overlay::setOverlayText(const QString &text, bool isZone) { setHidden(true); m_isZone = isZone; + QPalette p; + p.setColor(QPalette::Text, Qt::white); + if (m_isZone) p.setColor(QPalette::Base, QColor(200, 0, 0)); + else p.setColor(QPalette::Base, QColor(0, 0, 200)); + setPalette(p); setText(' ' + text + ' '); setHidden(false); update(); diff --git a/src/monitor.h b/src/monitor.h index 79cb5b69..898754ee 100644 --- a/src/monitor.h +++ b/src/monitor.h @@ -56,7 +56,6 @@ class Overlay : public QLabel Q_OBJECT public: Overlay(QWidget* parent); - virtual void paintEvent(QPaintEvent * event); void setOverlayText(const QString &, bool isZone = true); private: -- 2.39.2