Skip to content

Commit 4c4445c

Browse files
committed
rlottie: Add support of animated emojis
1 parent 93d10b2 commit 4c4445c

File tree

11 files changed

+298
-194
lines changed

11 files changed

+298
-194
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ trim_trailing_whitespace = true
77
insert_final_newline = true
88
charset = utf-8
99

10-
[*.{build,yml,ui,yaml,css}]
10+
[*.{build,yml,ui,yaml,css,xml}]
1111
indent_size = 2

Cargo.lock

Lines changed: 74 additions & 49 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

data/resources/resources.gresource.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<file compressed="true" preprocess="xml-stripblanks">ui/content-chat-info-window.ui</file>
2020
<file compressed="true" preprocess="xml-stripblanks">ui/content-event-row.ui</file>
2121
<file compressed="true" preprocess="xml-stripblanks">ui/content-message-document.ui</file>
22+
<file compressed="true" preprocess="xml-stripblanks">ui/content-message-animated-emoji.ui</file>
2223
<file compressed="true" preprocess="xml-stripblanks">ui/content-message-photo.ui</file>
2324
<file compressed="true" preprocess="xml-stripblanks">ui/content-message-sticker.ui</file>
2425
<file compressed="true" preprocess="xml-stripblanks">ui/content-message-text.ui</file>
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<interface>
3+
<template class="MessageAnimatedEmoji" parent="MessageBase">
4+
<child>
5+
<object class="GtkBox" id="gtk_box">
6+
<property name="orientation">vertical</property>
7+
<property name="vexpand">true</property>
8+
<child>
9+
<object class="GtkGestureClick" id="click">
10+
<property name="button">1</property>
11+
</object>
12+
</child>
13+
<child>
14+
<object class="AdwBin" id="bin">
15+
<property name="vexpand">true</property>
16+
</object>
17+
</child>
18+
<child>
19+
<object class="MessageIndicators" id="indicators">
20+
<property name="halign">end</property>
21+
<property name="valign">end</property>
22+
</object>
23+
</child>
24+
</object>
25+
</child>
26+
</template>
27+
</interface>

src/session/content/chat_action_bar.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ impl ChatActionBar {
305305
let chooser = gtk::EmojiChooser::new();
306306
chooser.set_parent(parent);
307307
chooser.connect_emoji_picked(clone!(@weak self as obj => move |_, emoji| {
308-
obj.imp().message_entry.insert_at_cursor(emoji);
308+
obj.imp().message_entry.insert_at_cursor(emoji.trim_end_matches('\u{fe0f}'));
309309
}));
310310
chooser.connect_hide(clone!(@weak self as obj => move |_| {
311311
obj.imp().message_entry.grab_focus();
@@ -358,9 +358,10 @@ impl ChatActionBar {
358358
client_id,
359359
)
360360
.await;
361+
361362
if let Err(e) = result {
362-
log::warn!("Error sending a message: {:?}", e);
363-
}
363+
log::warn!("Error sending a message: {:?}", e)
364+
};
364365

365366
self.reset();
366367
}

0 commit comments

Comments
 (0)