- bugfixes

overtake · Jul 3, 2024 · 3a1ce35 · 3a1ce35
2 parents c550b2c + 513d4f2
commit 3a1ce35
Show file tree

Hide file tree

Showing 23 changed files with 99 additions and 55 deletions.
diff --git a/Telegram-Mac/ChatInputActionsView.swift b/Telegram-Mac/ChatInputActionsView.swift
@@ -81,10 +81,12 @@ class ChatInputActionsView: View {
         }, for: .LongMouseDown)
 
 
-        muteChannelMessages.set(handler: { [weak self] _ in
+        muteChannelMessages.set(handler: { [weak self] control in
             if let chatInteraction = self?.chatInteraction {
                 FastSettings.toggleChannelMessagesMuted(chatInteraction.peerId)
-                (self?.superview?.superview as? View)?.updateLocalizationAndTheme(theme: theme)
+                let isMuted = FastSettings.isChannelMessagesMuted(chatInteraction.peerId)
+                (self?.superview?.superview as? ChatInputView)?.updatePlaceholder()
+                tooltip(for: control, text: isMuted ? strings().messagesSilentTooltipSilent : strings().messagesSilentTooltip)
             }
         }, for: .Click)
 

diff --git a/Telegram-Mac/ChatInputView.swift b/Telegram-Mac/ChatInputView.swift
@@ -849,6 +849,10 @@ class ChatInputView: View, Notifable {
         self.textView.placeholder = textPlaceholder
     }
 
+    func updatePlaceholder() {
+        self.textView.placeholder = textPlaceholder
+    }
+
     private func updateAccesory(animated: Bool) {
         self.accessory.measureSize(self.frame.width - 40.0)
         self.inputDidUpdateLayout(animated: animated)

diff --git a/Telegram-Mac/ChatListRowView.swift b/Telegram-Mac/ChatListRowView.swift
@@ -524,7 +524,7 @@ private final class TopicNameAndTextView : View {
 
 
                         var rect: NSRect
-                        rect = item.rect.insetBy(dx: -2, dy: -2)
+                        rect = item.rect.insetBy(dx: 1, dy: 1)
 
                         if textLayout.hasBlock {
                             rect = rect.offsetBy(dx: 6, dy: 1)

diff --git a/Telegram-Mac/ChatServiceItem.swift b/Telegram-Mac/ChatServiceItem.swift
@@ -2423,7 +2423,7 @@ class ChatServiceRowView: TableRowView {
                     if textLayout.isBigEmoji {
                         rect = item.rect
                     } else {
-                        rect = item.rect.insetBy(dx: -2, dy: -2)
+                        rect = item.rect
                     }
                     if let item = self.item as? ChatServiceItem, item.isBubbled {
                         rect = rect.offsetBy(dx: 9, dy: 2)

diff --git a/Telegram-Mac/CoreExtension.swift b/Telegram-Mac/CoreExtension.swift
@@ -4083,7 +4083,7 @@ func concatMessageAttributes(_ attributes: [MessageTextEntity]) -> [MessageTextE
 
 extension TelegramMediaImage {
     convenience init(dimension: PixelDimensions, immediateThumbnailData: Data?) {
-        self.init(imageId: .init(namespace: 0, id: 0), representations: [.init(dimensions: dimension, resource: CloudFileMediaResource(datacenterId: 0, volumeId: 0, localId: 0, secret: 0, size: nil, fileReference: nil), progressiveSizes: [], immediateThumbnailData: immediateThumbnailData)], immediateThumbnailData: immediateThumbnailData, reference: nil, partialReference: nil, flags: [])
+        self.init(imageId: .init(namespace: 0, id: 0), representations: [.init(dimensions: dimension, resource: LocalBundleResource(name: "", ext: ""), progressiveSizes: [], immediateThumbnailData: immediateThumbnailData)], immediateThumbnailData: immediateThumbnailData, reference: nil, partialReference: nil, flags: [])
 
     }
 }
diff --git a/Telegram-Mac/DataAndStorageViewController.swift b/Telegram-Mac/DataAndStorageViewController.swift
@@ -459,12 +459,12 @@ private func entries(state: State, data: DataAndStorageData, proxy: ProxySetting
     entries.append(.autoplayVideos(sectionId, autoplayMedia.videos, viewType: .lastItem))
 
 
-    #if DEBUG
-    entries.append(.sectionId(sectionId))
-    sectionId += 1
-    entries.append(.sensitiveContent(sectionId, false, viewType: .singleItem))
-    entries.append(.sensitiveContentInfo(sectionId, viewType: .textBottomItem))
-    #endif
+//    #if DEBUG
+//    entries.append(.sectionId(sectionId))
+//    sectionId += 1
+//    entries.append(.sensitiveContent(sectionId, false, viewType: .singleItem))
+//    entries.append(.sensitiveContentInfo(sectionId, viewType: .textBottomItem))
+//    #endif
 
     entries.append(.sectionId(sectionId))
     sectionId += 1

diff --git a/Telegram-Mac/Extensions.swift b/Telegram-Mac/Extensions.swift
@@ -1849,7 +1849,11 @@ func copyToClipboard(_ input: ChatTextInputState) -> Void {
 
 extension LAPolicy {
     static var applicationPolicy: LAPolicy {
-        return .deviceOwnerAuthentication
+        if #available(macOS 10.15, *) {
+            return .deviceOwnerAuthenticationWithBiometricsOrWatch
+        } else {
+            return .deviceOwnerAuthentication
+        }
     }
 }
 

diff --git a/Telegram-Mac/GalleryThumbsControlView.swift b/Telegram-Mac/GalleryThumbsControlView.swift
@@ -123,6 +123,8 @@ class GalleryThumbContainer : Control {
         addSubview(overlay)
         overlay.backgroundColor = .black
         layer?.cornerRadius = .cornerRadius
+
+        handleScrollEventOnInteractionEnabled = false
     }
 
     deinit {
@@ -164,9 +166,11 @@ class GalleryThumbsControlView: View {
 
         documentView.backgroundColor = .clear
 
+        self.layer?.cornerRadius = 4
+
 
-        NotificationCenter.default.addObserver(self, selector: #selector(scrollDidUpdated), name: NSView.boundsDidChangeNotification, object: scrollView.contentView)
-        NotificationCenter.default.addObserver(self, selector: #selector(scrollDidUpdated), name: NSView.frameDidChangeNotification, object: scrollView)
+       // NotificationCenter.default.addObserver(self, selector: #selector(scrollDidUpdated), name: NSView.boundsDidChangeNotification, object: scrollView.contentView)
+        //NotificationCenter.default.addObserver(self, selector: #selector(scrollDidUpdated), name: NSView.frameDidChangeNotification, object: scrollView)
 
     }
 
@@ -200,7 +204,6 @@ class GalleryThumbsControlView: View {
 
         previousRange = range
 
-        documentView.subviews = range.location == NSNotFound ? [] : items.subarray(with: range).map { $0.view }
     }
 
     override func layout() {
@@ -312,7 +315,8 @@ class GalleryThumbsControlView: View {
             scrollView.clipView.scroll(to: NSMakePoint(min(max(items[selectedIndex].frame.midX - frame.width / 2, 0), max(documentView.frame.width - frame.width, 0)), 0), animated: animated && documentView.subviews.count > 0)
         }
         previousRange = nil
-        scrollDidUpdated()
+        documentView.subviews = items.map { $0.view }
+
     }
 
 }
diff --git a/Telegram-Mac/Info.plist b/Telegram-Mac/Info.plist
@@ -35,7 +35,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>265501</string>
+	<string>265458</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>

diff --git a/Telegram-Mac/PasscodeLockController.swift b/Telegram-Mac/PasscodeLockController.swift
@@ -26,7 +26,7 @@ private class TouchIdContainerView : View {
         button.autohighlight = false
         button.style = ControlStyle(font: .medium(.title), foregroundColor: theme.colors.underSelectedColor, backgroundColor: theme.colors.accent, highlightColor: theme.colors.accent)
         button.set(font: .medium(.title), for: .Normal)
-        button.set(color: .white, for: .Normal)
+        button.set(color: theme.colors.underSelectedColor, for: .Normal)
 
         button.set(text: strings().passcodeUseTouchId, for: .Normal)
         button.set(image: theme.icons.passcodeTouchId, for: .Normal)
@@ -407,18 +407,20 @@ class PasscodeLockController: ModalViewController {
         }
     }
 
+    private var touchIdCalled = false
+
     override func windowDidBecomeKey() {
         super.windowDidBecomeKey()
 
-        if NSApp.isActive, useTouchId {
+        if NSApp.isActive, useTouchId, !touchIdCalled {
             callTouchId()
+            touchIdCalled = true
         }
     }
 
     override func windowDidResignKey() {
         super.windowDidResignKey()
         if !NSApp.isActive, useTouchId {
-            invalidateTouchId()
         }
     }
 

diff --git a/Telegram-Mac/StoryControlsView.swift b/Telegram-Mac/StoryControlsView.swift
@@ -213,7 +213,7 @@ final class StoryControlsView : Control {
         avatarAndText.scaleOnClick = true
 
         avatarAndText.set(handler: { [weak self] control in
-            if let groupId = self?.groupId {
+            if let groupId = self?.story?.peer?.id {
                 self?.arguments?.openPeerInfo(groupId, control)
             }
         }, for: .Click)

diff --git a/Telegram-Mac/StoryListView.swift b/Telegram-Mac/StoryListView.swift
@@ -993,7 +993,7 @@ final class StoryListView : Control, Notifable {
                     if textLayout.isBigEmoji {
                         rect = item.rect
                     } else {
-                        rect = item.rect.insetBy(dx: -2, dy: -2)
+                        rect = item.rect
                     }
 
                     let view: InlineStickerItemLayer

diff --git a/Telegram-Mac/StoryModalController.swift b/Telegram-Mac/StoryModalController.swift
@@ -2305,6 +2305,7 @@ final class StoryModalController : ModalViewController, Notifable {
                         PeerInfoController.push(navigation: context.bindings.rootNavigation(), context: context, peerId: peerId)
                     }
                     self?.close()
+                    closeAllModals(window: context.window)
                 }
 
                 if let view = view, let event = NSApp.currentEvent {

diff --git a/Telegram-Mac/VideoRecorderPipeline.swift b/Telegram-Mac/VideoRecorderPipeline.swift
@@ -120,7 +120,8 @@ class VideoRecorderPipeline : NSObject, AVCaptureVideoDataOutputSampleBufferDele
             audioDevices.insert(device, at: 0)
         }
 
-        let videoDevice = videoDevices.first(where: { $0.isConnected && !$0.isSuspended})
+        let videoDevice = videoDevices.filter({ $0.isConnected && !$0.isSuspended }).first(where: { $0.position == .front || $0.position == .unspecified })
+
         let audioDevice = audioDevices.first(where: { $0.isConnected && !$0.isSuspended})
 
 
@@ -135,6 +136,7 @@ class VideoRecorderPipeline : NSObject, AVCaptureVideoDataOutputSampleBufferDele
         }
 
         videoOutput.alwaysDiscardsLateVideoFrames = false
+        videoOutput
 
         videoOutput.videoSettings = [kCVPixelBufferPixelFormatTypeKey as String: kCVPixelFormatType_32BGRA, kCVPixelBufferIOSurfacePropertiesKey as String: [:], kCVPixelBufferWidthKey as String: 500, kCVPixelBufferHeightKey as String: 500]
 

diff --git a/Telegram-Mac/WPContentView.swift b/Telegram-Mac/WPContentView.swift
@@ -360,7 +360,7 @@ class WPContentView: Control, MultipleSelectable, ModalPreviewRowViewProtocol {
                 if textLayout.isBigEmoji {
                     rect = item.rect
                 } else {
-                    rect = item.rect.insetBy(dx: -2, dy: -2)
+                    rect = item.rect
                 }
 
                 let view: InlineStickerItemLayer

diff --git a/Telegram-Mac/WebpageModalController.swift b/Telegram-Mac/WebpageModalController.swift
@@ -1682,7 +1682,7 @@ class WebpageModalController: ModalViewController, WKNavigationDelegate, WKUIDel
 
             if self?.isBackButton == true {
                 items.append(.init(strings().webAppClose, handler: { [weak self] in
-                    self?.closeAnyway()
+                    self?.close()
                 }, itemImage: MenuAnimation.menu_clear_history.value))
             }
 

diff --git a/Telegram-Mac/en.lproj/Localizable.strings b/Telegram-Mac/en.lproj/Localizable.strings
diff --git a/Telegram.xcodeproj/project.pbxproj b/Telegram.xcodeproj/project.pbxproj
@@ -8393,7 +8393,7 @@
 					"$(PROJECT_DIR)/core-xprojects/webrtc/build/webrtc",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 10.15;
+				MARKETING_VERSION = 10.15.1;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CODE_SIGN_FLAGS = "";
 				OTHER_LDFLAGS = (
@@ -8445,7 +8445,7 @@
 					"$(PROJECT_DIR)/core-xprojects/openssl/build/openssl/lib",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 10.15;
+				MARKETING_VERSION = 10.15.1;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CODE_SIGN_FLAGS = "";
 				OTHER_LDFLAGS = "$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/macosx/libswiftAppKit.dylib";
@@ -8493,7 +8493,7 @@
 					"$(PROJECT_DIR)/core-xprojects/openssl/build/openssl/lib",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 10.15;
+				MARKETING_VERSION = 10.15.1;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CODE_SIGN_FLAGS = "";
 				OTHER_LDFLAGS = "$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/macosx/libswiftAppKit.dylib";
@@ -8612,7 +8612,7 @@
 					"$(PROJECT_DIR)/core-xprojects/webrtc/build/webrtc",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 10.15;
+				MARKETING_VERSION = 10.15.1;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CODE_SIGN_FLAGS = "";
 				OTHER_LDFLAGS = (

diff --git a/TelegramShare/Info.plist b/TelegramShare/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>265501</string>
+	<string>265458</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSMinimumSystemVersion</key>

diff --git a/packages/Localization/Sources/Localization/Localizable.swift b/packages/Localization/Sources/Localization/Localizable.swift
@@ -10471,6 +10471,10 @@ public final class L10n {
   public static var messagesReplyLoadingHeader: String  { return L10n.tr("Localizable", "Messages.ReplyLoading.Header") }
   /// Loading...
   public static var messagesReplyLoadingLoading: String  { return L10n.tr("Localizable", "Messages.ReplyLoading.Loading") }
+  /// subscribers will be notified when you post.
+  public static var messagesSilentTooltip: String  { return L10n.tr("Localizable", "Messages.Silent.Tooltip") }
+  /// subscribers will receive a silent notification.
+  public static var messagesSilentTooltipSilent: String  { return L10n.tr("Localizable", "Messages.Silent.Tooltip.Silent") }
   /// Apply
   public static var modalApply: String  { return L10n.tr("Localizable", "Modal.Apply") }
   /// Cancel

diff --git a/packages/TGUIKit/Sources/HorizontalTableView.swift b/packages/TGUIKit/Sources/HorizontalTableView.swift
@@ -18,32 +18,40 @@ public class HorizontalTableView: TableView {
 
         self.clipView.border = []
         self.tableView.border = []
+
+    }
+
+    public override func updateAfterInitialize(isFlipped: Bool = true, bottomInset: CGFloat = 0, drawBorder: Bool = false) {
+        super.updateAfterInitialize(isFlipped: isFlipped, bottomInset: bottomInset, drawBorder: drawBorder)
+
+        self.hasHorizontalScroller = false
+        self.horizontalScrollElasticity = .none
     }
 
-    public override func scrollWheel(with event: NSEvent) {
-
+
+
+    override open func scrollWheel(with event: NSEvent) {
+
+        if let applyExternalScroll = self.applyExternalScroll, applyExternalScroll(event) {
+            return
+        }
+
         var scrollPoint = contentView.bounds.origin
         let isInverted: Bool = System.isScrollInverted
-
         if event.scrollingDeltaY != 0 {
             if isInverted {
                 scrollPoint.y += -event.scrollingDeltaY
             } else {
                 scrollPoint.y -= event.scrollingDeltaY
             }
+            scrollPoint.y = max(0, min(scrollPoint.y, listHeight - clipView.bounds.height))
+            clipView.scroll(to: scrollPoint)
+            window?.scrollWheel(with: event)
+            return
         }
-
-        if event.scrollingDeltaX != 0 {
-            if !isInverted {
-                scrollPoint.y += -event.scrollingDeltaX
-            } else {
-                scrollPoint.y -= event.scrollingDeltaX
-            }
+        if event.scrollingDeltaY != 0 || event.scrollingDeltaX != 0 {
+            super.scrollWheel(with: event)
         }
-
-        scrollPoint.y = max(0, min(scrollPoint.y, listHeight - clipView.bounds.height))
-        clipView.scroll(to: scrollPoint)
-
 
     }
 
@@ -99,6 +107,20 @@ public class HorizontalTableView: TableView {
 
 
 open class HorizontalScrollView : ScrollView {
+
+
+
+    public override init(frame frameRect: NSRect) {
+        super.init(frame: frameRect)
+        self.hasVerticalScroller = false
+        self.verticalScrollElasticity = .none
+    }
+
+    required public init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+
     override open func scrollWheel(with event: NSEvent) {
 
         if let applyExternalScroll = self.applyExternalScroll, applyExternalScroll(event) {
@@ -113,17 +135,16 @@ open class HorizontalScrollView : ScrollView {
             } else {
                 scrollPoint.x -= event.scrollingDeltaY
             }
-        }
-        if event.scrollingDeltaX != 0 {
-            if !isInverted {
-                scrollPoint.x += -event.scrollingDeltaX
-            } else {
-                scrollPoint.x -= event.scrollingDeltaX
-            }
-        }
-        if documentView!.frame.width > frame.width {
             scrollPoint.x = min(max(0, floorToScreenPixels(backingScaleFactor, scrollPoint.x)), documentView!.frame.width - frame.width)
             clipView.scroll(to: scrollPoint)
+            window?.scrollWheel(with: event)
+            return
+        }
+
+        if documentView!.frame.width > frame.width {
+            if event.scrollingDeltaY != 0 || event.scrollingDeltaX != 0 {
+                super.scrollWheel(with: event)
+            }
         } else {
             superview?.scrollWheel(with: event)
         }

diff --git a/packages/TGVideoCameraMovie/Sources/TGVideoCameraMovieRecorder.m b/packages/TGVideoCameraMovie/Sources/TGVideoCameraMovieRecorder.m
@@ -82,7 +82,7 @@ + (NSDictionary *)videoSettingsForPreset:(TGMediaVideoConversionPreset)preset di
 
     return @
     {
-    AVVideoCodecKey: AVVideoCodecH264,
+    AVVideoCodecKey: AVVideoCodecTypeH264,
     AVVideoCompressionPropertiesKey: codecSettings,
     AVVideoWidthKey: @((NSInteger)dimensions.width),
     AVVideoHeightKey: @((NSInteger)dimensions.height)