┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/panels/information/informationpanelcontent.cpp6
-rw-r--r--src/panels/information/mediawidget.cpp10
-rw-r--r--src/panels/information/mediawidget.h1
3 files changed, 11 insertions, 6 deletions
diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index afca9a76c..285ce3ae9 100644
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -501,10 +501,8 @@ void InformationPanelContent::adjustWidgetSizes(int width)
// try to increase the preview as large as possible
m_preview->setSizeHint(QSize(maxWidth, maxWidth));
- if (m_mediaWidget->isVisible()) {
- // assure that the size of the video player is the same as the preview size
- m_mediaWidget->setVideoSize(QSize(maxWidth, maxWidth));
- }
+ // assure that the size of the video player is the same as the preview size
+ m_mediaWidget->setVideoSize(QSize(maxWidth, maxWidth));
}
#include "moc_informationpanelcontent.cpp"
diff --git a/src/panels/information/mediawidget.cpp b/src/panels/information/mediawidget.cpp
index 2ab6803e8..20366445a 100644
--- a/src/panels/information/mediawidget.cpp
+++ b/src/panels/information/mediawidget.cpp
@@ -151,7 +151,9 @@ void MediaWidget::setUrl(const QUrl &url, MediaKind kind)
if (m_url != url) {
m_url = url;
m_isVideo = kind == MediaKind::Video;
- m_seekSlider->setValue(0);
+ if (m_seekSlider) {
+ m_seekSlider->setValue(0);
+ }
}
if (m_autoPlay) {
play();
@@ -220,7 +222,11 @@ void MediaWidget::showEvent(QShowEvent *event)
QWidget::showEvent(event);
return;
}
+ initLayout();
+}
+void MediaWidget::initLayout()
+{
if (!m_topLayout) {
m_topLayout = new QVBoxLayout(this);
m_topLayout->setContentsMargins(0, 0, 0, 0);
@@ -285,6 +291,7 @@ void MediaWidget::onStateChanged(QMediaPlayer::PlaybackState newState)
void MediaWidget::initPlayer()
{
if (!m_player) {
+ initLayout();
m_player = new QMediaPlayer;
m_player->setAudioOutput(new QAudioOutput);
@@ -294,7 +301,6 @@ void MediaWidget::initPlayer()
m_videoWidget->installEventFilter(this);
m_player->setVideoOutput(m_videoWidget);
m_topLayout->insertWidget(0, m_videoWidget);
-
applyVideoSize();
connect(m_player, &QMediaPlayer::playbackStateChanged, this, &MediaWidget::onStateChanged);
diff --git a/src/panels/information/mediawidget.h b/src/panels/information/mediawidget.h
index bd04266e6..f5b970d5e 100644
--- a/src/panels/information/mediawidget.h
+++ b/src/panels/information/mediawidget.h
@@ -70,6 +70,7 @@ private:
void applyVideoSize();
void togglePlayback();
void initPlayer();
+ void initLayout();
QUrl m_url;
QSize m_videoSize;