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

Merge pull request #622 from AttorneyOnline/fix/emote-button-gen

Browse Source 
Fix emote buttons not generating due to bad VPath lookup
This commit is contained in:
oldmud0 2021-12-24 09:09:43 -06:00 committed by GitHub
commit d1fb7fde16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/aoemotebutton.h
View File

@ -14,7 +14,7 @@ public:
int p_w, int p_h); int p_w, int p_h);
void set_image(QString p_image, QString p_emote_comment); void set_image(QString p_image, QString p_emote_comment);
void set_char_image(QString p_char, int p_emote, QString suffix); void set_char_image(QString p_char, int p_emote, bool on);
void set_id(int p_id) { m_id = p_id; } void set_id(int p_id) { m_id = p_id; }
int get_id() { return m_id; } int get_id() { return m_id; }

48
src/aoemotebutton.cpp
View File

@ -25,11 +25,27 @@ void AOEmoteButton::set_image(QString p_image, QString p_emote_comment)
"\") 0 0 0 0 stretch stretch; }" "\") 0 0 0 0 stretch stretch; }"
"QToolTip { color: #000000; background-color: #ffffff; border: 0px; }"); "QToolTip { color: #000000; background-color: #ffffff; border: 0px; }");
} }
else if ((p_image.contains("_on") && else {
file_exists(tmp_p_image.replace("_on", "_off"))) || this->setText(p_emote_comment);
(p_image.contains("_off") && this->setStyleSheet("QPushButton { border-image: url(); }"
file_exists(tmp_p_image.replace("_off", "_on")))) { "QToolTip { background-image: url(); color: #000000; "
QImage tmpImage(tmp_p_image); "background-color: #ffffff; border: 0px; }");
}
}
void AOEmoteButton::set_char_image(QString p_char, int p_emote, bool on)
{
QString emotion_number = QString::number(p_emote + 1);
QStringList suffixes { "_off", "_on" };
QStringList suffixedPaths;
for (const QString &suffix : suffixes) {
suffixedPaths.append(ao_app->get_image_suffix(ao_app->get_character_path(
p_char, "emotions/button" + emotion_number + suffix)));
}
QString emoteComment = ao_app->get_emote_comment(p_char, p_emote);
if (!file_exists(suffixedPaths[on]) && file_exists(suffixedPaths[!on])) {
QImage tmpImage(suffixedPaths[!on]);
tmpImage = tmpImage.convertToFormat(QImage::Format_ARGB32); tmpImage = tmpImage.convertToFormat(QImage::Format_ARGB32);
QPoint p1, p2; QPoint p1, p2;
p2.setY(tmpImage.height()); p2.setY(tmpImage.height());
@ -46,25 +62,13 @@ void AOEmoteButton::set_image(QString p_image, QString p_emote_comment)
p.fillRect(0, 0, tmpImage.width(), tmpImage.height(), gradient); p.fillRect(0, 0, tmpImage.width(), tmpImage.height(), gradient);
p.end(); p.end();
tmpImage.save(p_image, "png");
set_image(p_image, p_emote_comment); // Original suffixed path may be empty, so create the path again
} suffixedPaths[on] = QString(suffixedPaths[!on]).replace(suffixes[!on], suffixes[on]);
else { tmpImage.save(suffixedPaths[on], "png");
this->setText(p_emote_comment);
this->setStyleSheet("QPushButton { border-image: url(); }"
"QToolTip { background-image: url(); color: #000000; "
"background-color: #ffffff; border: 0px; }");
}
} }
void AOEmoteButton::set_char_image(QString p_char, int p_emote, QString suffix) set_image(suffixedPaths[on], emoteComment);
{
QString emotion_number = QString::number(p_emote + 1);
QString image_path =
ao_app->get_image_suffix(ao_app->get_character_path(
p_char, "emotions/button" + emotion_number + suffix));
this->set_image(image_path, ao_app->get_emote_comment(p_char, p_emote));
} }
void AOEmoteButton::on_clicked() { emit emote_clicked(m_id); } void AOEmoteButton::on_clicked() { emit emote_clicked(m_id); }

8
src/emotes.cpp
View File

@ -126,9 +126,9 @@ void Courtroom::set_emote_page()
AOEmoteButton *f_emote = ui_emote_list.at(n_emote); AOEmoteButton *f_emote = ui_emote_list.at(n_emote);
if (n_real_emote == current_emote) if (n_real_emote == current_emote)
f_emote->set_char_image(current_char, n_real_emote, "_on"); f_emote->set_char_image(current_char, n_real_emote, true);
else else
f_emote->set_char_image(current_char, n_real_emote, "_off"); f_emote->set_char_image(current_char, n_real_emote, false);
f_emote->show(); f_emote->show();
f_emote->setToolTip(QString::number(n_real_emote + 1) + ": " + f_emote->setToolTip(QString::number(n_real_emote + 1) + ": " +
@ -158,7 +158,7 @@ void Courtroom::select_emote(int p_id)
if (current_emote >= min && current_emote <= max) if (current_emote >= min && current_emote <= max)
ui_emote_list.at(current_emote % max_emotes_on_page) ui_emote_list.at(current_emote % max_emotes_on_page)
->set_char_image(current_char, current_emote, "_off"); ->set_char_image(current_char, current_emote, false);
int old_emote = current_emote; int old_emote = current_emote;
@ -166,7 +166,7 @@ void Courtroom::select_emote(int p_id)
if (current_emote >= min && current_emote <= max) if (current_emote >= min && current_emote <= max)
ui_emote_list.at(current_emote % max_emotes_on_page) ui_emote_list.at(current_emote % max_emotes_on_page)
->set_char_image(current_char, current_emote, "_on"); ->set_char_image(current_char, current_emote, true);
int emote_mod = ao_app->get_emote_mod(current_char, current_emote); int emote_mod = ao_app->get_emote_mod(current_char, current_emote);