Fix some edge cases where the AOChar qlabel is moved around in weird ways (reload theme still puts qlabel at 0,0 without centering)
Fix a full message of speed 0 not properly displaying itself
This commit is contained in:
parent
8ab5a3a6b2
commit
85f33e13c7
@ -240,7 +240,6 @@ QPixmap AOCharMovie::get_pixmap(QImage image)
|
||||
|
||||
f_pixmap = f_pixmap.scaledToHeight(f_h, transform_mode);
|
||||
this->resize(f_pixmap.size());
|
||||
QLabel::move(x + (f_w - f_pixmap.width())/2, y + (f_h - f_pixmap.height())); //Always center horizontally, always put at the bottom vertically
|
||||
|
||||
return f_pixmap;
|
||||
}
|
||||
@ -248,7 +247,7 @@ QPixmap AOCharMovie::get_pixmap(QImage image)
|
||||
void AOCharMovie::set_frame(QPixmap f_pixmap)
|
||||
{
|
||||
this->setPixmap(f_pixmap);
|
||||
QLabel::move(x + (this->width() - this->pixmap()->width())/2, y);
|
||||
QLabel::move(x + (f_w - f_pixmap.width())/2, y + (f_h - f_pixmap.height())); //Always center horizontally, always put at the bottom vertically
|
||||
}
|
||||
|
||||
void AOCharMovie::combo_resize(int w, int h)
|
||||
|
@ -2605,7 +2605,7 @@ void Courtroom::chat_tick()
|
||||
next_character_is_not_special = false;
|
||||
}
|
||||
|
||||
if (formatting_char || (message_display_speed[current_display_speed] <= 0 && tick_pos < f_message.size()))
|
||||
if ((message_display_speed[current_display_speed] <= 0 && tick_pos < f_message.size()-1) || formatting_char)
|
||||
{
|
||||
chat_tick_timer->start(0); //Don't bother rendering anything out as we're doing the SPEED. (there's latency otherwise)
|
||||
if (!formatting_char || f_character == "n")
|
||||
|
Loading…
Reference in New Issue
Block a user