rlottie: Merge animated emojis and sticker widgets

paper-plane-developers · Feb 13, 2023 · edf97cd · edf97cd
1 parent a5964a8
commit edf97cd
Show file tree

Hide file tree

Showing 7 changed files with 96 additions and 245 deletions.
diff --git a/data/resources/resources.gresource.xml b/data/resources/resources.gresource.xml
@@ -21,7 +21,6 @@
     <file compressed="true" preprocess="xml-stripblanks">ui/content-chat-info-window.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/content-event-row.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/content-message-document.ui</file>
-    <file compressed="true" preprocess="xml-stripblanks">ui/content-message-animated-emoji.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/content-message-photo.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/content-message-sticker.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/content-message-text.ui</file>

diff --git a/data/resources/style-dark.css b/data/resources/style-dark.css
@@ -2,6 +2,11 @@
   background-color: @dark_2;
 }
 
+/* sticker must be repainted to a text color in messages */
+messagesticker.needs-repainting > overlay > widget > widget {
+  filter: invert(1);
+}
+
 .chat-list row .unread-count-muted {
   background-color: @dark_2;
 }

diff --git a/data/resources/ui/content-message-animated-emoji.ui b/data/resources/ui/content-message-animated-emoji.ui
diff --git a/data/resources/ui/content-message-sticker.ui b/data/resources/ui/content-message-sticker.ui
@@ -3,6 +3,11 @@
   <template class="MessageSticker" parent="MessageBase">
     <child>
       <object class="GtkOverlay" id="overlay">
+        <child>
+          <object class="GtkGestureClick" id="click">
+            <property name="button">1</property>
+          </object>
+        </child>
         <child>
           <object class="AdwBin" id="bin"/>
         </child>
@@ -15,4 +20,4 @@
       </object>
     </child>
   </template>
-</interface>
+</interface>
diff --git a/src/session/content/message_row/animated_emoji.rs b/src/session/content/message_row/animated_emoji.rs
diff --git a/src/session/content/message_row/mod.rs b/src/session/content/message_row/mod.rs
@@ -1,4 +1,3 @@
-mod animated_emoji;
 mod base;
 mod bubble;
 mod document;
@@ -11,7 +10,6 @@ mod sticker;
 mod text;
 mod video;
 
-use self::animated_emoji::MessageAnimatedEmoji;
 use self::base::{MessageBase, MessageBaseExt, MessageBaseImpl};
 use self::bubble::MessageBubble;
 use self::document::MessageDocument;
@@ -338,9 +336,9 @@ impl MessageRow {
                 }
                 MessageContent::MessageAnimatedEmoji(data)
                     if data.animated_emoji.sticker.clone().map(
-                        |s| matches!(s.format, StickerFormat::Tgs)
+                        |s| matches!(s.format, StickerFormat::Webp | StickerFormat::Tgs)
                     ).unwrap_or_default() => {
-                    self.update_specific_content::<_, MessageAnimatedEmoji>(message_.clone());
+                    self.update_specific_content::<_, MessageSticker>(message_.clone());
                 }
                 MessageContent::MessagePhoto(_) => {
                     self.update_specific_content::<_, MessagePhoto>(message_.clone());