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

Fix some edge cases where the AOChar qlabel is moved around in weird ways (reload theme still puts qlabel at 0,0 without centering)

Browse Source 
Fix a full message of speed 0 not properly displaying itself
This commit is contained in:
Crystalwarrior 2019-10-06 13:27:11 +03:00
parent 8ab5a3a6b2
commit 85f33e13c7
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/aocharmovie.cpp
View File

@ -240,7 +240,6 @@ QPixmap AOCharMovie::get_pixmap(QImage image)
f_pixmap = f_pixmap.scaledToHeight(f_h, transform_mode); f_pixmap = f_pixmap.scaledToHeight(f_h, transform_mode);
this->resize(f_pixmap.size()); 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; return f_pixmap;
} }
@ -248,7 +247,7 @@ QPixmap AOCharMovie::get_pixmap(QImage image)
void AOCharMovie::set_frame(QPixmap f_pixmap) void AOCharMovie::set_frame(QPixmap f_pixmap)
{ {
this->setPixmap(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) void AOCharMovie::combo_resize(int w, int h)

2
src/courtroom.cpp
View File

@ -2605,7 +2605,7 @@ void Courtroom::chat_tick()
next_character_is_not_special = false; 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) 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") if (!formatting_char || f_character == "n")