From 90ac7a4f3471c7b1cfed83c2a023b6d961db83d5 Mon Sep 17 00:00:00 2001 From: Marco Gittler Date: Mon, 20 Dec 2010 11:37:08 +0000 Subject: [PATCH] fixed gl widget on mac (did not resize anymore) svn path=/trunk/kdenlive/; revision=5182 --- src/monitor.cpp | 3 +++ src/videoglwidget.cpp | 5 +++++ src/videoglwidget.h | 1 + 3 files changed, 9 insertions(+) diff --git a/src/monitor.cpp b/src/monitor.cpp index 96b76be3..f84c1b0b 100644 --- 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 cbe08e38..219a96a8 100644 --- 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 8e653be9..0eef4c8a 100644 --- 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); }; -- 2.39.2