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

[<tt...@us...>]

Revision: 5827
          http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5827&view=rev
Author:   ttill
Date:     2011-08-10 08:51:42 +0000 (Wed, 10 Aug 2011)

Log Message:
-----------
Fix 'adjust to original size' and 'fit to width/height' for title and color clips in geometry widget.

Modified Paths:
--------------
    trunk/kdenlive/CHANGELOG
    trunk/kdenlive/src/geometrywidget.cpp

Modified: trunk/kdenlive/CHANGELOG
===================================================================
--- trunk/kdenlive/CHANGELOG	2011-08-09 14:54:34 UTC (rev 5826)
+++ trunk/kdenlive/CHANGELOG	2011-08-10 08:51:42 UTC (rev 5827)
@@ -21,6 +21,7 @@
     * Allow use of different ffmpeg preset for 1st and 2nd render pass.
     * Notes widget: context menu now allows to insert clickable timecode to make easy reference to some place in the project.
 
+    * Fix 'adjust to original size' and 'fit to width/height' for title and color clips in geometry widget (pan and zoom, composite, affine).
     * Fix possible crash in DVD wizard chapters. (http://kdenlive.org/mantis/view.php?id=2264)
     * Do not duplicate effect stack after split audio but move audio effects only.
     * Fix issues related to the usage of comma as numeric separator in some locales.

Modified: trunk/kdenlive/src/geometrywidget.cpp
===================================================================
--- trunk/kdenlive/src/geometrywidget.cpp	2011-08-09 14:54:34 UTC (rev 5826)
+++ trunk/kdenlive/src/geometrywidget.cpp	2011-08-10 08:51:42 UTC (rev 5827)
@@ -711,7 +711,9 @@
 
 void GeometryWidget::slotAdjustToFrameSize()
 {
-    if (m_frameSize == QPoint()) m_frameSize = QPoint(m_monitor->render->frameRenderWidth(), m_monitor->render->renderHeight());
+    if (m_frameSize == QPoint() || m_frameSize.x() == 0 || m_frameSize.y() == 0) {
+        m_frameSize = QPoint(m_monitor->render->frameRenderWidth(), m_monitor->render->renderHeight());
+    }
     m_spinWidth->blockSignals(true);
     m_spinHeight->blockSignals(true);
     m_spinWidth->setValue((int) (m_frameSize.x() / m_monitor->render->sar() + 0.5));
@@ -723,7 +725,9 @@
 
 void GeometryWidget::slotFitToWidth()
 {
-    if (m_frameSize == QPoint()) m_frameSize = QPoint(m_monitor->render->frameRenderWidth(), m_monitor->render->renderHeight());
+    if (m_frameSize == QPoint() || m_frameSize.x() == 0 || m_frameSize.y() == 0) {
+        m_frameSize = QPoint(m_monitor->render->frameRenderWidth(), m_monitor->render->renderHeight());
+    }
     double factor = (double) m_monitor->render->frameRenderWidth() / m_frameSize.x() * m_monitor->render->sar();
     m_spinWidth->blockSignals(true);
     m_spinHeight->blockSignals(true);
@@ -736,7 +740,9 @@
 
 void GeometryWidget::slotFitToHeight()
 {
-    if (m_frameSize == QPoint()) m_frameSize = QPoint(m_monitor->render->frameRenderWidth(), m_monitor->render->renderHeight());
+    if (m_frameSize == QPoint() || m_frameSize.x() == 0 || m_frameSize.y() == 0) {
+        m_frameSize = QPoint(m_monitor->render->frameRenderWidth(), m_monitor->render->renderHeight());
+    }
     double factor = (double) m_monitor->render->renderHeight() / m_frameSize.y();
     m_spinWidth->blockSignals(true);
     m_spinHeight->blockSignals(true);


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