fixed gl widget on mac (did not resize anymore)

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

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 96b76be3004a503ce30a8b570d412d6a26c820f9..f84c1b0b84285d05cdfa4052db57ddc0f52e30cf 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -181,6 +181,9 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget
         m_videoBox->setLayout(lay);
         render = new Render(m_name, (int) m_monitorRefresh->winId(), profile, this);
         m_monitorRefresh->setRenderer(render);
+    }else if (m_glWidget) {
+        lay->addWidget(m_glWidget);
+        m_videoBox->setLayout(lay);
     }
 
     connect(m_audioSlider, SIGNAL(valueChanged(int)), this, SLOT(slotSetVolume(int)));

diff --git a/src/videoglwidget.cpp b/src/videoglwidget.cpp
index cbe08e3838c19826384e6d1870fedbef15787535..219a96a87f6580ffdfb0be892db8193d585d4ee1 100644 (file)
--- a/src/videoglwidget.cpp
+++ b/src/videoglwidget.cpp
@@ -48,8 +48,13 @@ void VideoGLWidget::initializeGL()
     glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 }
 
+void VideoGLWidget::resizeEvent(QResizeEvent* event)
+{
+    resizeGL(event->size().width(),event->size().height());
+}
 void VideoGLWidget::resizeGL(int width, int height)
 {
+
     double this_aspect = (double) width / height;
 
     // Special case optimisation to negate odd effect of sample aspect ratio

diff --git a/src/videoglwidget.h b/src/videoglwidget.h
index 8e653be9a28f05ab8bd0ed4eaee1a0d31cd5134b..0eef4c8aacd4c78100b3f0e84582dea64cb23be5 100644 (file)
--- a/src/videoglwidget.h
+++ b/src/videoglwidget.h
@@ -35,6 +35,7 @@ public slots:
 protected:
     void initializeGL();
     void resizeGL(int width, int height);
+    void resizeEvent(QResizeEvent* event);
     void paintGL();
     void mouseDoubleClickEvent(QMouseEvent * event);
 };