Fix quote create in RepliesWidget.

This commit is contained in:
John Preston 2023-10-31 23:41:41 +04:00
parent 097c3c4a5a
commit 35e457c924
3 changed files with 5 additions and 3 deletions

View File

@ -1355,6 +1355,7 @@ void ComposeControls::init() {
cancelReplyMessage(); cancelReplyMessage();
} }
_preview->apply(webpage); _preview->apply(webpage);
_field->setFocus();
}; };
const auto replyToId = reply.messageId; const auto replyToId = reply.messageId;
const auto highlight = crl::guard(_wrap.get(), [=] { const auto highlight = crl::guard(_wrap.get(), [=] {

View File

@ -581,7 +581,7 @@ bool AddReplyToMessageAction(
const ContextMenuRequest &request, const ContextMenuRequest &request,
not_null<ListWidget*> list) { not_null<ListWidget*> list) {
const auto context = list->elementContext(); const auto context = list->elementContext();
const auto item = request.item; const auto item = request.quoteItem ? request.quoteItem : request.item;
const auto topic = item ? item->topic() : nullptr; const auto topic = item ? item->topic() : nullptr;
const auto peer = item ? item->history()->peer.get() : nullptr; const auto peer = item ? item->history()->peer.get() : nullptr;
if (!item if (!item

View File

@ -2604,8 +2604,9 @@ void ListWidget::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
request.view = _overElement; request.view = _overElement;
request.item = overItem; request.item = overItem;
request.pointState = _overState.pointState; request.pointState = _overState.pointState;
const auto quote = (overItemView && _selectedTextItem == overItem) const auto quote = (_overElement
? overItemView->selectedQuote(_selectedTextRange) && _selectedTextItem == _overElement->data())
? _overElement->selectedQuote(_selectedTextRange)
: SelectedQuote(); : SelectedQuote();
request.quote = quote.text; request.quote = quote.text;
request.quoteItem = quote.item; request.quoteItem = quote.item;