[Kdenlive-svn] SF.net SVN: kdenlive:[5182] trunk/kdenlive/src

[<g-...@us...>]

Revision: 5182
          http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5182&view=rev
Author:   g-marco
Date:     2010-12-20 11:37:08 +0000 (Mon, 20 Dec 2010)

Log Message:
-----------
fixed gl widget on mac (did not resize anymore)

Modified Paths:
--------------
    trunk/kdenlive/src/monitor.cpp
    trunk/kdenlive/src/videoglwidget.cpp
    trunk/kdenlive/src/videoglwidget.h

Modified: trunk/kdenlive/src/monitor.cpp
===================================================================
--- trunk/kdenlive/src/monitor.cpp	2010-12-18 14:34:39 UTC (rev 5181)
+++ trunk/kdenlive/src/monitor.cpp	2010-12-20 11:37:08 UTC (rev 5182)
@@ -181,6 +181,9 @@
         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)));

Modified: trunk/kdenlive/src/videoglwidget.cpp
===================================================================
--- trunk/kdenlive/src/videoglwidget.cpp	2010-12-18 14:34:39 UTC (rev 5181)
+++ trunk/kdenlive/src/videoglwidget.cpp	2010-12-20 11:37:08 UTC (rev 5182)
@@ -48,8 +48,13 @@
     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

Modified: trunk/kdenlive/src/videoglwidget.h
===================================================================
--- trunk/kdenlive/src/videoglwidget.h	2010-12-18 14:34:39 UTC (rev 5181)
+++ trunk/kdenlive/src/videoglwidget.h	2010-12-20 11:37:08 UTC (rev 5182)
@@ -35,6 +35,7 @@
 protected:
     void initializeGL();
     void resizeGL(int width, int height);
+    void resizeEvent(QResizeEvent* event);
     void paintGL();
     void mouseDoubleClickEvent(QMouseEvent * event);
 };


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.