aboutsummaryrefslogtreecommitdiff
path: root/src/emotes.cpp
diff options
context:
space:
mode:
authorTrickyLeifa <date.epoch@gmail.com>2024-05-17 16:39:30 +0200
committerTrickyLeifa <date.epoch@gmail.com>2024-05-17 19:04:57 +0200
commit1ef96383c8f7ed136a0e028aef0835b4838b5e95 (patch)
treee87a9df097a50b4d1f918f8a4f37d210562d10d6 /src/emotes.cpp
parent39e4354b1dae5d8487ea5b84be9f304b1950a61a (diff)
Lightly reworked `NetworkManager`, ...
* Lightly reworked `NetworkManager` * Added new modules to handle various connection types. * TCP * WebSocket * Added general string splitter alias based on Qt version. * Replaced `lobby_constructed` and `courtroom_constructed` * Refactored and partially reimplemented the following classes: * `AOBlipPlayer` * `AOEmotePreview` * `AOMusicPlayer` * `AOSfxPlayer` * `AOTextArea`
Diffstat (limited to 'src/emotes.cpp')
-rw-r--r--src/emotes.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/emotes.cpp b/src/emotes.cpp
index c12ceb69..4023b521 100644
--- a/src/emotes.cpp
+++ b/src/emotes.cpp
@@ -22,6 +22,7 @@ void Courtroom::initialize_emotes()
emote_preview = new AOEmotePreview(ao_app, this);
emote_preview->setObjectName("ui_emote_preview");
+ emote_preview->resize(256, 192);
connect(ui_emote_left, &AOButton::clicked, this, &Courtroom::on_emote_left_clicked);
connect(ui_emote_right, &AOButton::clicked, this, &Courtroom::on_emote_right_clicked);
@@ -262,7 +263,7 @@ void Courtroom::show_emote_menu(const QPoint &pos)
emote_menu->setDefaultAction(emote_menu->addAction("Preview Selected", this, [this] {
emote_preview->show();
emote_preview->raise();
- emote_preview->set_widgets();
+ emote_preview->updateViewportGeometry();
update_emote_preview();
}));
QString prefix;
@@ -291,8 +292,8 @@ void Courtroom::preview_emote(QString f_emote)
{
emote_preview->show();
emote_preview->raise();
- emote_preview->set_widgets();
- emote_preview->play(f_emote, current_char, ui_flip->isChecked(), ui_pair_offset_spinbox->value(), ui_pair_vert_offset_spinbox->value());
+ emote_preview->updateViewportGeometry();
+ emote_preview->display(current_char, f_emote, ui_flip->isChecked(), ui_pair_offset_spinbox->value(), ui_pair_vert_offset_spinbox->value());
}
void Courtroom::on_emote_left_clicked()