Funkwhale
/
strawberry-audio-player-windows-mac-linux
mirror of https://github.com/strawberrymusicplayer/strawberry
1
0
Fork 0
Code Issues Releases Wiki Activity

Attempt to improve playing widget up/down

This commit is contained in:
Jonas Kvinge 2020-09-28 20:09:23 +02:00
parent b63030d302
commit a8b40747b2
1 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/widgets/playingwidget.cpp
View File

@ -149,14 +149,20 @@ void PlayingWidget::Init(Application *app, AlbumCoverChoiceController *album_cov
} }
void PlayingWidget::SetEnabled(bool enabled) { void PlayingWidget::SetEnabled(bool enabled) {
if (enabled == enabled_) return;
if (enabled) SetEnabled(); if (enabled) SetEnabled();
else SetDisabled(); else SetDisabled();
} }
void PlayingWidget::SetEnabled() { void PlayingWidget::SetEnabled() {
if (enabled_) return;
enabled_ = true; enabled_ = true;
if (active_ && (!visible_ || (timeline_show_hide_->state() == QTimeLine::Running && timeline_show_hide_->currentFrame() <= 2))) {
if (active_) {
SetVisible(true); SetVisible(true);
} }
@ -164,30 +170,37 @@ void PlayingWidget::SetEnabled() {
void PlayingWidget::SetDisabled() { void PlayingWidget::SetDisabled() {
if (!enabled_) return;
enabled_ = false; enabled_ = false;
if (visible_ || (timeline_show_hide_->state() == QTimeLine::Running && timeline_show_hide_->currentFrame() > 2 && total_height_ - timeline_show_hide_->currentFrame() <= 2)) {
SetVisible(false); SetVisible(false);
}
} }
void PlayingWidget::SetVisible(bool visible) { void PlayingWidget::SetVisible(bool visible) {
if (timeline_show_hide_->state() == QTimeLine::Running) { if (timeline_show_hide_->state() == QTimeLine::Running) {
if (timeline_show_hide_->direction() == QTimeLine::Backward && enabled_ && active_) { if (timeline_show_hide_->currentFrame() <= 5) {
timeline_show_hide_->toggleDirection(); timeline_show_hide_->stop();
} }
if (timeline_show_hide_->direction() == QTimeLine::Forward && (!enabled_ || !active_)) { else if (timeline_show_hide_->direction() == QTimeLine::Backward && enabled_ && active_) {
timeline_show_hide_->toggleDirection(); timeline_show_hide_->toggleDirection();
}
return; return;
} }
else if (timeline_show_hide_->direction() == QTimeLine::Forward && (!enabled_ || !active_)) {
timeline_show_hide_->toggleDirection();
return;
}
else {
timeline_show_hide_->stop();
}
}
if (visible == visible_) return; if (visible != visible_) {
timeline_show_hide_->setFrameRange(0, total_height_); timeline_show_hide_->setFrameRange(0, total_height_);
timeline_show_hide_->setDirection(visible ? QTimeLine::Forward : QTimeLine::Backward); timeline_show_hide_->setDirection(visible ? QTimeLine::Forward : QTimeLine::Backward);
timeline_show_hide_->start(); timeline_show_hide_->start();
}
} }
@ -332,8 +345,8 @@ void PlayingWidget::SetHeight(int height) {
setMaximumHeight(height); setMaximumHeight(height);
update(); update();
if (height >= total_height_) visible_ = true; if (height >= total_height_ - 5) visible_ = true;
if (height <= 0) visible_ = false; if (height <= 5) visible_ = false;
if (timeline_show_hide_->state() == QTimeLine::Running) { if (timeline_show_hide_->state() == QTimeLine::Running) {
if (timeline_show_hide_->direction() == QTimeLine::Backward && enabled_ && active_) { if (timeline_show_hide_->direction() == QTimeLine::Backward && enabled_ && active_) {