new way to react

overtake · Jan 14, 2022 · e056960 · e056960
1 parent d115da8
commit e056960
Show file tree

Hide file tree

Showing 102 changed files with 185 additions and 2,300 deletions.
diff --git a/Telegram-Mac/ChatLayoutUtils.swift b/Telegram-Mac/ChatLayoutUtils.swift
@@ -44,7 +44,9 @@ class ChatLayoutUtils: NSObject {
                     return NSMakeSize(width, 40)
                 }
             }
-            if file.isAnimatedSticker && !webpIsFile {
+            if file.isWebm {
+                size = NSMakeSize(240, 240)
+            } else if file.isAnimatedSticker && !webpIsFile {
                 let dimensions = file.dimensions?.size
                 size = NSMakeSize(240, 240)
                 if file.isEmojiAnimatedSticker {
@@ -122,7 +124,9 @@ class ChatLayoutUtils: NSObject {
         if media is TelegramMediaImage {
             return ChatInteractiveContentView.self
         } else if let file = media as? TelegramMediaFile {
-            if file.mimeType == "image/webp" && !packs && !webpIsFile {
+            if file.isWebm {
+                return ChatGIFContentView.self
+            } else if file.mimeType == "image/webp" && !packs && !webpIsFile {
                 return MediaAnimatedStickerView.self
             } else if file.isStaticSticker && !webpIsFile {
                 return ChatStickerContentView.self

diff --git a/Telegram-Mac/ChatReactionsView.swift b/Telegram-Mac/ChatReactionsView.swift
@@ -14,7 +14,6 @@ import MergeLists
 import Reactions
 import AppKit
 import SwiftSignalKit
-import CAPortal
 
 final class ChatReactionsLayout {
 
@@ -740,10 +739,6 @@ final class ChatReactionsView : View {
 
             transition.updateFrame(view: self.imageView, frame: CGRect(origin: NSMakePoint(presentation.insetOuter, (size.height - presentation.reactionSize.height) / 2), size: presentation.reactionSize))
 
-            if let effetView = effetView {
-                let viewSize = NSMakeSize(presentation.reactionSize.width * 2, presentation.reactionSize.height * 2)
-//                transition.updateFrame(view: effetView, frame: CGRect(origin: NSMakePoint(presentation.insetOuter, (size.height - viewSize.height) / 2), size: viewSize))
-            }
 
             if let textView = textView, let text = reaction.text {
                 let center = focus(text.size)

diff --git a/Telegram-Mac/ChatRowItem.swift b/Telegram-Mac/ChatRowItem.swift
@@ -983,6 +983,9 @@ class ChatRowItem: TableRowItem {
                 if file.isStaticSticker {
                     return false
                 }
+                if file.isWebm {
+                    return false
+                }
                 if file.isAnimatedSticker {
                     return false
                 }
@@ -2025,7 +2028,9 @@ class ChatRowItem: TableRowItem {
                        return ChatServiceItem(initialSize, interaction, interaction.context, entry, downloadSettings, theme: theme)
                    }
                } else if let file = message.media[0] as? TelegramMediaFile {
-                    if file.isInstantVideo {
+                    if file.isWebm {
+                        return ChatGIFMediaItem(initialSize, interaction, interaction.context,entry, downloadSettings, theme: theme)
+                    } else if file.isInstantVideo {
                         return ChatVideoMessageItem(initialSize, interaction, interaction.context,entry, downloadSettings, theme: theme)
                     } else if file.isVideo && !file.isAnimated {
                         return ChatMediaItem(initialSize, interaction, interaction.context, entry, downloadSettings, theme: theme)

diff --git a/Telegram-Mac/CoreExtension.swift b/Telegram-Mac/CoreExtension.swift
@@ -1173,6 +1173,14 @@ extension Media {
         }
         return false
     }
+
+    var isWebm: Bool {
+        if let media = self as? TelegramMediaFile {
+            return media.mimeType == "video/webm"
+        }
+        return false
+    }
+
     var isVideoFile:Bool {
         if let media = self as? TelegramMediaFile {
             return media.mimeType.hasPrefix("video/mp4") || media.mimeType.hasPrefix("video/mov") || media.mimeType.hasPrefix("video/avi")

diff --git a/Telegram-Mac/Info.plist b/Telegram-Mac/Info.plist
@@ -35,7 +35,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>226398</string>
+	<string>226421</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.social-networking</string>
 	<key>LSFileQuarantineEnabled</key>

diff --git a/Telegram-Mac/MediaPlayerFramePreview.swift b/Telegram-Mac/MediaPlayerFramePreview.swift
@@ -78,7 +78,7 @@ private final class MediaPlayerFramePreviewImpl {
                                     strongSelf.framePipe.putNext(.waitingForData)
                                 case let .image(image):
                                     if let image = image {
-                                        strongSelf.framePipe.putNext(.image(image))
+                                        strongSelf.framePipe.putNext(.image(image._cgImage!))
                                     }
                                     strongSelf.currentFrameTimestamp = nil
                                     if let nextFrameTimestamp = strongSelf.nextFrameTimestamp {

diff --git a/Telegram-Mac/SoftwareVideoLayerFrameManager.swift b/Telegram-Mac/SoftwareVideoLayerFrameManager.swift
@@ -97,7 +97,7 @@ final class SoftwareVideoLayerFrameManager {
 
         self.dataDisposable.set((firstReady |> deliverOn(applyQueue)).start(next: { [weak self] path in
             if let strongSelf = self {
-                let _ = strongSelf.source.swap(SoftwareVideoSource(path: path))
+                let _ = strongSelf.source.swap(SoftwareVideoSource(path: path, hintVP9: true))
             }
         }))
     }

diff --git a/Telegram-Mac/SoftwareVideoSource.swift b/Telegram-Mac/SoftwareVideoSource.swift