From e7c3dafa362e7a4427a4429f4d55e994eaa54ad3 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Thu, 1 Aug 2019 21:15:46 +0200 Subject: [PATCH] Handle a case where the playing widget is gets stuck when switch fast between context and other widgets --- src/widgets/playingwidget.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/widgets/playingwidget.cpp b/src/widgets/playingwidget.cpp index 3fb879dd6..115d4248d 100644 --- a/src/widgets/playingwidget.cpp +++ b/src/widgets/playingwidget.cpp @@ -159,12 +159,16 @@ void PlayingWidget::SetEnabled(bool enabled) { void PlayingWidget::SetEnabled() { enabled_ = true; - if (!visible_ && active_) SetVisible(true); + if (active_ && (!visible_ || (timeline_show_hide_->state() == QTimeLine::Running && timeline_show_hide_->currentFrame() <= 2))) { + SetVisible(true); + } } void PlayingWidget::SetDisabled() { enabled_ = false; - if (visible_) SetVisible(false); + if (visible_ || (timeline_show_hide_->state() == QTimeLine::Running && timeline_show_hide_->currentFrame() > 2 && total_height_ - timeline_show_hide_->currentFrame() <= 2)) { + SetVisible(false); + } } void PlayingWidget::SetVisible(bool visible) {