Skip to content

Commit 0cd1770

Browse files
committed
Fix message input height computation for paid messages
1 parent a42f04b commit 0cd1770

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

submodules/AttachmentTextInputPanelNode/Sources/AttachmentTextInputPanelNode.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -632,8 +632,10 @@ public class AttachmentTextInputPanelNode: ASDisplayNode, TGCaptionPanelView, AS
632632
}
633633

634634
private func calculateTextFieldMetrics(width: CGFloat, maxHeight: CGFloat, metrics: LayoutMetrics) -> (accessoryButtonsWidth: CGFloat, textFieldHeight: CGFloat) {
635-
let textFieldInsets = self.textFieldInsets(metrics: metrics)
636-
635+
var textFieldInsets = self.textFieldInsets(metrics: metrics)
636+
if self.actionButtons.frame.width > 44.0 {
637+
textFieldInsets.right = self.actionButtons.frame.width
638+
}
637639
let fieldMaxHeight = textFieldMaxHeight(maxHeight, metrics: metrics)
638640

639641
var textFieldMinHeight: CGFloat = 35.0

submodules/TelegramUI/Sources/ChatTextInputPanelNode.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1316,7 +1316,10 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate, Ch
13161316
let accessoryButtonInset = self.accessoryButtonInset
13171317
let accessoryButtonSpacing = self.accessoryButtonSpacing
13181318

1319-
let textFieldInsets = self.textFieldInsets(metrics: metrics)
1319+
var textFieldInsets = self.textFieldInsets(metrics: metrics)
1320+
if self.actionButtons.frame.width > 44.0 {
1321+
textFieldInsets.right = self.actionButtons.frame.width - 2.0
1322+
}
13201323

13211324
let fieldMaxHeight = textFieldMaxHeight(maxHeight, metrics: metrics)
13221325

0 commit comments

Comments
 (0)