Merge KFO source unconditionally into AO2

1 files changed, 22 insertions, 11 deletions

diff --git a/src/aoemotebutton.cpp b/src/aoemotebutton.cpp
index 29329c9..abec526 100644
--- a/src/aoemotebutton.cpp
+++ b/src/aoemotebutton.cpp
@@ -3,32 +3,43 @@
 #include "file_functions.h"
 
 AOEmoteButton::AOEmoteButton(QWidget *p_parent, AOApplication *p_ao_app,
-                             int p_x, int p_y)
+                             int p_x, int p_y, int p_w, int p_h)
     : QPushButton(p_parent)
 {
   parent = p_parent;
   ao_app = p_ao_app;
 
   this->move(p_x, p_y);
-  this->resize(40, 40);
+  this->resize(p_w, p_h);
 
   connect(this, SIGNAL(clicked()), this, SLOT(on_clicked()));
 }
 
-void AOEmoteButton::set_image(QString p_char, int p_emote, QString suffix)
+void AOEmoteButton::set_image(QString p_image, QString p_emote_comment)
 {
-  QString emotion_number = QString::number(p_emote + 1);
-  QString image_path = ao_app->get_character_path(
-      p_char, "emotions/button" + emotion_number + suffix);
-
-  if (file_exists(image_path)) {
+  if (file_exists(p_image)) {
     this->setText("");
-    this->setStyleSheet("border-image:url(\"" + image_path + "\")");
+    this->setStyleSheet(
+        "QPushButton { border-image: url(\"" + p_image +
+        "\") 0 0 0 0 stretch stretch; }"
+        "QToolTip { color: #000000; background-color: #ffffff; border: 0px; }");
   }
   else {
-    this->setText(ao_app->get_emote_comment(p_char, p_emote));
-    this->setStyleSheet("border-image:url(\"\")");
+    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)
+{
+  QString emotion_number = QString::number(p_emote + 1);
+  QString image_path =
+      ao_app->get_static_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() { emote_clicked(m_id); }