svn path=/trunk/kdenlive/; revision=5443
}
QWidget *spacer = new QWidget(this);
}
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);
m_toolbar->addWidget(spacer);
m_timePos = new TimecodeDisplay(m_monitorManager->timecode(), this);
m_toolbar->addWidget(m_timePos);
if (m_monitorRefresh == NULL) {
// Using OpenGL display
#if defined(Q_WS_MAC) || defined(USE_OPEN_GL)
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);
- 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);
}
m_overlay->raise();
m_overlay->setHidden(true);
}
} else {
delete m_overlay;
m_overlay = NULL;
} else {
delete m_overlay;
m_overlay = NULL;
// 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);
// 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);
}
//setAttribute(Qt::WA_NoSystemBackground);
}
QLabel(parent)
{
setAttribute(Qt::WA_TransparentForMouseEvents);
QLabel(parent)
{
setAttribute(Qt::WA_TransparentForMouseEvents);
- //setAttribute(Qt::WA_OpaquePaintEvent);
- //setAttribute(Qt::WA_NoSystemBackground);
setAutoFillBackground(true);
setBackgroundRole(QPalette::Base);
setAutoFillBackground(true);
setBackgroundRole(QPalette::Base);
+ setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
void Overlay::setOverlayText(const QString &text, bool isZone)
{
setHidden(true);
void Overlay::setOverlayText(const QString &text, bool isZone)
{
setHidden(true);
- Overlay(QWidget* parent);
+ Overlay(QWidget* parent = 0);
void setOverlayText(const QString &, bool isZone = true);
private:
void setOverlayText(const QString &, bool isZone = true);
private: