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

Made it so that AOCharMovie accepts both excessively wide and excessively tall sprites.

Browse Source 
They are resized and centered appropriately.
This commit is contained in:
Cerapter 2018-09-28 16:14:44 +02:00
parent c17fe46e76
commit 5930bf569b
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
aocharmovie.cpp
View File

@ -146,16 +146,29 @@ void AOCharMovie::combo_resize(int w, int h)
m_movie->setScaledSize(f_size); m_movie->setScaledSize(f_size);
} }
void AOCharMovie::move(int ax, int ay)
{
x = ax;
y = ay;
QLabel::move(x, y);
}
void AOCharMovie::frame_change(int n_frame) void AOCharMovie::frame_change(int n_frame)
{ {
if (movie_frames.size() > n_frame) if (movie_frames.size() > n_frame)
{ {
QPixmap f_pixmap = QPixmap::fromImage(movie_frames.at(n_frame)); QPixmap f_pixmap = QPixmap::fromImage(movie_frames.at(n_frame));
auto aspect_ratio = Qt::KeepAspectRatio;
if (f_pixmap.size().width() > f_pixmap.size().height())
aspect_ratio = Qt::KeepAspectRatioByExpanding;
if (f_pixmap.size().width() > this->size().width() || f_pixmap.size().height() > this->size().height()) if (f_pixmap.size().width() > this->size().width() || f_pixmap.size().height() > this->size().height())
this->setPixmap(f_pixmap.scaled(this->width(), this->height(), Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation)); this->setPixmap(f_pixmap.scaled(this->width(), this->height(), aspect_ratio, Qt::SmoothTransformation));
else else
this->setPixmap(f_pixmap.scaled(this->width(), this->height(), Qt::KeepAspectRatioByExpanding, Qt::FastTransformation)); this->setPixmap(f_pixmap.scaled(this->width(), this->height(), aspect_ratio, Qt::FastTransformation));
QLabel::move(x + (this->width() - this->pixmap()->width())/2, y);
} }
if (m_movie->frameCount() - 1 == n_frame && play_once) if (m_movie->frameCount() - 1 == n_frame && play_once)