simplify monitor overlay info

svn path=/trunk/kdenlive/; revision=4472

diff --git a/src/monitor.cpp b/src/monitor.cpp
index a550944f0b6821b09e345ca44762fdb0622a6156..5a88b826acad97c5c5001da66f02bacd876592b2 100644 (file)
--- 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 79cb5b69ad889244c5ed3eddf578eab4368e5a8e..898754ee0acac5231c5d2e3fd79486180823bb27 100644 (file)
--- 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: