]> cloud.milkyroute.net Git - dolphin.git/commitdiff
fixed issue that the video preview size was wrong during resizing the information...
authorPeter Penz <peter.penz19@gmail.com>
Fri, 24 Apr 2009 15:34:42 +0000 (15:34 +0000)
committerPeter Penz <peter.penz19@gmail.com>
Fri, 24 Apr 2009 15:34:42 +0000 (15:34 +0000)
svn path=/trunk/KDE/kdebase/apps/; revision=958762

src/panels/information/informationpanel.cpp
src/panels/information/phononwidget.cpp

index 2349a6cffc635265124acc2c6e8d46913ad6ac6e..1b8724f46568c566b529d0b542e81d2fe5d999e4 100644 (file)
@@ -712,7 +712,7 @@ void InformationPanel::updatePhononWidget()
                                       : PhononWidget::Audio;
             m_phononWidget->setMode(mode);
             m_phononWidget->setUrl(item.url());
                                       : PhononWidget::Audio;
             m_phononWidget->setMode(mode);
             m_phononWidget->setUrl(item.url());
-            if (mode == PhononWidget::Video) {
+            if ((mode == PhononWidget::Video) && m_preview->isVisible()) {
                 m_phononWidget->setVideoSize(m_preview->size());
             }
         } else {
                 m_phononWidget->setVideoSize(m_preview->size());
             }
         } else {
index 798a4a35b22691c80cef643450cd51c48efb7db0..7f2ca95648120696d3f78b06bffb0f436c2dc19e 100644 (file)
@@ -41,13 +41,11 @@ class EmbeddedVideoPlayer : public Phonon::VideoPlayer
         EmbeddedVideoPlayer(Phonon::Category category, QWidget *parent = 0) :
             Phonon::VideoPlayer(category, parent)
         {
         EmbeddedVideoPlayer(Phonon::Category category, QWidget *parent = 0) :
             Phonon::VideoPlayer(category, parent)
         {
-            setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
         }
 
         void setSizeHint(const QSize& size)
         {
             m_sizeHint = size;
         }
 
         void setSizeHint(const QSize& size)
         {
             m_sizeHint = size;
-            setFixedHeight(size.height());
             updateGeometry();
         }
 
             updateGeometry();
         }