Instantly jump-to-message on reply bar ctrl+click.

Telegram/SourceFiles/history/history_widget.cpp

@@ -6279,6 +6279,8 @@ void HistoryWidget::mousePressEvent(QMouseEvent *e) {
 		} else {
 			_forwardPanel->editOptions(controller()->uiShow());
 		}
+	} else if (_replyTo && (e->modifiers() & Qt::ControlModifier)) {
+		jumpToReply(_replyTo);
 	} else if (_replyTo) {
 		editDraftOptions();
 	} else if (_kbReplyTo) {
@@ -6307,12 +6309,9 @@ void HistoryWidget::editDraftOptions() {
 		_preview->apply(webpage);
 	};
 	const auto replyToId = reply.messageId;
-	const auto highlight = [=] {
+	const auto highlight = crl::guard(this, [=](FullReplyTo to) {
-		controller()->showPeerHistory(
+		jumpToReply(to);
-			replyToId.peer,
+	});
-			Window::SectionShow::Way::Forward,
-			replyToId.msg);
-	};
 
 	using namespace HistoryView::Controls;
 	EditDraftOptions({
@@ -6328,6 +6327,12 @@ void HistoryWidget::editDraftOptions() {
 	});
 }
 
+void HistoryWidget::jumpToReply(FullReplyTo to) {
+	if (const auto item = session().data().message(to.messageId)) {
+		JumpToMessageClickHandler(item, {}, to.quote)->onClick({});
+	}
+}
+
 void HistoryWidget::keyPressEvent(QKeyEvent *e) {
 	if (!_history) return;
 

Telegram/SourceFiles/history/history_widget.h

@@ -550,6 +550,7 @@ private:
 
 	void setupPreview();
 	void editDraftOptions();
+	void jumpToReply(FullReplyTo to);
 
 	void messagesReceived(not_null<PeerData*> peer, const MTPmessages_Messages &messages, int requestId);
 	void messagesFailed(const MTP::Error &error, int requestId);

Telegram/SourceFiles/history/view/controls/history_view_compose_controls.cpp

@@ -130,7 +130,7 @@ public:
 	[[nodiscard]] FullReplyTo replyingToMessage() const;
 	[[nodiscard]] FullMsgId editMsgId() const;
 	[[nodiscard]] rpl::producer<FullMsgId> editMsgIdValue() const;
-	[[nodiscard]] rpl::producer<FullMsgId> scrollToItemRequests() const;
+	[[nodiscard]] rpl::producer<FullReplyTo> jumpToItemRequests() const;
 	[[nodiscard]] rpl::producer<> editPhotoRequests() const;
 	[[nodiscard]] rpl::producer<> editOptionsRequests() const;
 	[[nodiscard]] MessageToEdit queryToEdit();
@@ -206,7 +206,7 @@ private:
 	QRect _shownMessagePreviewRect;
 
 	rpl::event_stream<bool> _visibleChanged;
-	rpl::event_stream<FullMsgId> _scrollToItemRequests;
+	rpl::event_stream<FullReplyTo> _jumpToItemRequests;
 	rpl::event_stream<> _editOptionsRequests;
 	rpl::event_stream<> _editPhotoRequests;
 
@@ -372,9 +372,14 @@ void FieldHeader::init() {
 				if (_preview.parsed) {
 					_editOptionsRequests.fire({});
 				} else if (isEditingMessage()) {
-					_scrollToItemRequests.fire(_editMsgId.current());
+					_jumpToItemRequests.fire(FullReplyTo{
+						.messageId = _editMsgId.current()
+					});
 				} else if (readyToForward()) {
 					_forwardPanel->editOptions(_show);
+				} else if (reply
+					&& (e->modifiers() & Qt::ControlModifier)) {
+					_jumpToItemRequests.fire_copy(reply);
 				} else if (reply) {
 					_editOptionsRequests.fire({});
 				}
@@ -729,8 +734,8 @@ rpl::producer<FullMsgId> FieldHeader::editMsgIdValue() const {
 	return _editMsgId.value();
 }
 
-rpl::producer<FullMsgId> FieldHeader::scrollToItemRequests() const {
+rpl::producer<FullReplyTo> FieldHeader::jumpToItemRequests() const {
-	return _scrollToItemRequests.events();
+	return _jumpToItemRequests.events();
 }
 
 rpl::producer<> FieldHeader::editPhotoRequests() const {
@@ -1358,8 +1363,8 @@ void ComposeControls::init() {
 			_field->setFocus();
 		};
 		const auto replyToId = reply.messageId;
-		const auto highlight = crl::guard(_wrap.get(), [=] {
+		const auto highlight = crl::guard(_wrap.get(), [=](FullReplyTo to) {
-			_scrollToItemRequests.fire_copy(replyToId);
+			_jumpToItemRequests.fire_copy(to);
 		});
 
 		using namespace HistoryView::Controls;
@@ -2888,16 +2893,10 @@ Data::WebPageDraft ComposeControls::webPageDraft() const {
 	return _preview ? _preview->draft() : Data::WebPageDraft();
 }
 
-rpl::producer<Data::MessagePosition> ComposeControls::scrollRequests() const {
+rpl::producer<FullReplyTo> ComposeControls::jumpToItemRequests() const {
 	return rpl::merge(
-		_header->scrollToItemRequests(),
+		_header->jumpToItemRequests(),
-		_scrollToItemRequests.events()
+		_jumpToItemRequests.events());
-	) | rpl::map([=](FullMsgId id) -> Data::MessagePosition {
-		if (const auto item = session().data().message(id)) {
-			return item->position();
-		}
-		return {};
-	});
 }
 
 bool ComposeControls::isEditingMessage() const {

Telegram/SourceFiles/history/view/controls/history_view_compose_controls.h

@@ -159,7 +159,7 @@ public:
 	[[nodiscard]] rpl::producer<std::optional<bool>> attachRequests() const;
 	[[nodiscard]] rpl::producer<FileChosen> fileChosen() const;
 	[[nodiscard]] rpl::producer<PhotoChosen> photoChosen() const;
-	[[nodiscard]] rpl::producer<Data::MessagePosition> scrollRequests() const;
+	[[nodiscard]] rpl::producer<FullReplyTo> jumpToItemRequests() const;
 	[[nodiscard]] rpl::producer<InlineChosen> inlineResultChosen() const;
 	[[nodiscard]] rpl::producer<SendActionUpdate> sendActionUpdates() const;
 	[[nodiscard]] rpl::producer<not_null<QEvent*>> viewportEvents() const;
@@ -358,7 +358,7 @@ private:
 
 	const std::unique_ptr<Ui::RpWidget> _wrap;
 	const std::unique_ptr<Ui::RpWidget> _writeRestricted;
-	rpl::event_stream<FullMsgId> _scrollToItemRequests;
+	rpl::event_stream<FullReplyTo> _jumpToItemRequests;
 
 	std::optional<Ui::RoundRect> _backgroundRect;
 

Telegram/SourceFiles/history/view/controls/history_view_draft_options.cpp

@@ -673,7 +673,9 @@ void DraftOptionsBox(
 			tr::lng_reply_show_in_chat(),
 			st::settingsButton,
 			{ &st::menuIconShowInChat }
-		)->setClickedCallback(highlight);
+		)->setClickedCallback([=] {
+			highlight(resolveReply());
+		});
 
 		Settings::AddButton(
 			bottom,

Telegram/SourceFiles/history/view/controls/history_view_draft_options.h

@@ -32,7 +32,7 @@ struct EditDraftOptionsArgs {
 	std::vector<MessageLinkRange> links;
 	std::shared_ptr<WebpageResolver> resolver;
 	Fn<void(FullReplyTo, Data::WebPageDraft)> done;
-	Fn<void()> highlight;
+	Fn<void(FullReplyTo)> highlight;
 	Fn<void()> clearOldDraft;
 };
 

Telegram/SourceFiles/history/view/history_view_replies_section.cpp

@@ -791,9 +791,11 @@ void RepliesWidget::setupComposeControls() {
 		sendInlineResult(chosen.result, chosen.bot, chosen.options, localId);
 	}, lifetime());
 
-	_composeControls->scrollRequests(
+	_composeControls->jumpToItemRequests(
-	) | rpl::start_with_next([=](Data::MessagePosition pos) {
+	) | rpl::start_with_next([=](FullReplyTo to) {
-		showAtPosition(pos);
+		if (const auto item = session().data().message(to.messageId)) {
+			JumpToMessageClickHandler(item, {}, to.quote)->onClick({});
+		}
 	}, lifetime());
 
 	_composeControls->scrollKeyEvents(

Telegram/SourceFiles/history/view/history_view_scheduled_section.cpp

@@ -274,9 +274,15 @@ void ScheduledWidget::setupComposeControls() {
 		sendInlineResult(chosen.result, chosen.bot);
 	}, lifetime());
 
-	_composeControls->scrollRequests(
+	_composeControls->jumpToItemRequests(
-	) | rpl::start_with_next([=](Data::MessagePosition pos) {
+	) | rpl::start_with_next([=](FullReplyTo to) {
-		showAtPosition(pos);
+		if (const auto item = session().data().message(to.messageId)) {
+			if (item->isScheduled() && item->history() == _history) {
+				showAtPosition(item->position());
+			} else {
+				JumpToMessageClickHandler(item, {}, to.quote)->onClick({});
+			}
+		}
 	}, lifetime());
 
 	_composeControls->scrollKeyEvents(