Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix reload theme breaking BG sizing (#212)

Browse Source 
May need additional testing with animated BGs.
This commit is contained in:
Crystalwarrior 2020-07-31 23:07:14 +03:00 committed by GitHub
parent 740d825fd2
commit 56d7fff500
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/aoscene.cpp
View File

@ -24,14 +24,14 @@ void AOScene::set_image(QString p_image)
return; return;
} }
if (file_exists(background_path) && background_path == last_image) if (!file_exists(background_path) || background_path != last_image)
return; {
this->clear();
this->setMovie(nullptr);
this->clear(); m_movie->stop();
this->setMovie(nullptr); m_movie->setFileName(background_path);
}
m_movie->stop();
m_movie->setFileName(background_path);
if (m_movie->isValid() && m_movie->frameCount() > 1) { if (m_movie->isValid() && m_movie->frameCount() > 1) {
m_movie->jumpToNextFrame(); m_movie->jumpToNextFrame();
@ -43,9 +43,12 @@ void AOScene::set_image(QString p_image)
m_movie->setScaledSize(QSize(n_w, n_h)); m_movie->setScaledSize(QSize(n_w, n_h));
this->resize(m_movie->scaledSize()); this->resize(m_movie->scaledSize());
this->setMovie(m_movie); if (!file_exists(background_path) || background_path != last_image)
{
this->setMovie(m_movie);
m_movie->start();
}
QLabel::move(x + (f_w - n_w) / 2, y + (f_h - n_h) / 2); // Center QLabel::move(x + (f_w - n_w) / 2, y + (f_h - n_h) / 2); // Center
m_movie->start();
} }
else { else {
QPixmap background(background_path); QPixmap background(background_path);