From: <j-...@us...> - 2011-02-20 23:32:50
|
Revision: 5443 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5443&view=rev Author: j-b-m Date: 2011-02-20 23:32:44 +0000 (Sun, 20 Feb 2011) Log Message: ----------- Cleanup monitor overlay info (for marker and zone text) Modified Paths: -------------- trunk/kdenlive/src/monitor.cpp trunk/kdenlive/src/monitor.h Modified: trunk/kdenlive/src/monitor.cpp =================================================================== --- trunk/kdenlive/src/monitor.cpp 2011-02-20 21:55:30 UTC (rev 5442) +++ trunk/kdenlive/src/monitor.cpp 2011-02-20 23:32:44 UTC (rev 5443) @@ -204,7 +204,7 @@ } QWidget *spacer = new QWidget(this); - spacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + spacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred); m_toolbar->addWidget(spacer); m_timePos = new TimecodeDisplay(m_monitorManager->timecode(), this); m_toolbar->addWidget(m_timePos); @@ -886,13 +886,24 @@ if (m_monitorRefresh == NULL) { // Using OpenGL display #if defined(Q_WS_MAC) || defined(USE_OPEN_GL) - m_overlay = new Overlay(m_glWidget); + if (m_glWidget->layout()) delete m_glWidget->layout(); + m_overlay = new Overlay(); + QVBoxLayout *layout = new QVBoxLayout; + layout->addStretch(10); + layout->addWidget(m_overlay); + m_glWidget->setLayout(layout); #endif } else { - m_overlay = new Overlay(m_monitorRefresh); + if (m_monitorRefresh->layout()) delete m_monitorRefresh->layout(); + m_overlay = new Overlay(); + QVBoxLayout *layout = new QVBoxLayout; + layout->addStretch(10); + layout->addWidget(m_overlay); + m_monitorRefresh->setLayout(layout); m_overlay->raise(); m_overlay->setHidden(true); } + checkOverlay(); } else { delete m_overlay; m_overlay = NULL; @@ -1000,6 +1011,7 @@ // MonitorRefresh is used as container for the SDL display (it's window id is passed to SDL) setAttribute(Qt::WA_PaintOnScreen); setAttribute(Qt::WA_OpaquePaintEvent); + setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); //setAttribute(Qt::WA_NoSystemBackground); } @@ -1018,12 +1030,12 @@ QLabel(parent) { setAttribute(Qt::WA_TransparentForMouseEvents); - //setAttribute(Qt::WA_OpaquePaintEvent); - //setAttribute(Qt::WA_NoSystemBackground); setAutoFillBackground(true); setBackgroundRole(QPalette::Base); + setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); } + void Overlay::setOverlayText(const QString &text, bool isZone) { setHidden(true); Modified: trunk/kdenlive/src/monitor.h =================================================================== --- trunk/kdenlive/src/monitor.h 2011-02-20 21:55:30 UTC (rev 5442) +++ trunk/kdenlive/src/monitor.h 2011-02-20 23:32:44 UTC (rev 5443) @@ -91,7 +91,7 @@ { Q_OBJECT public: - Overlay(QWidget* parent); + Overlay(QWidget* parent = 0); void setOverlayText(const QString &, bool isZone = true); private: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |