mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-30 22:16:14 +00:00
Code Issues Releases Wiki Activity

Implement search inside a single topic.

Browse Source
This commit is contained in:
John Preston
2022-10-26 18:49:07 +04:00
parent 60aef7871a
commit ee8f997c14
8 changed files with 107 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Telegram/SourceFiles/dialogs/dialogs_inner_widget.cpp
View File

@@ -675,7 +675,12 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
}
if (_searchInChat) {
paintSearchInChat(p);
paintSearchInChat(p, {
.st = &st::forumTopicRow,
.now = ms,
.width = fullWidth,
.paused = videoPaused,
});
p.translate(0, searchInChatSkip());
if (_waitingForSearch && _searchResults.empty()) {
p.fillRect(
@@ -926,7 +931,9 @@ void InnerWidget::paintPeerSearchResult(
result->name.drawElided(p, rectForName.left(), rectForName.top(), rectForName.width());
}
void InnerWidget::paintSearchInChat(Painter &p) const {
void InnerWidget::paintSearchInChat(
Painter &p,
const Ui::PaintContext &context) const {
auto height = searchInChatSkip();
auto top = st::searchedBarHeight;
@@ -942,7 +949,9 @@ void InnerWidget::paintSearchInChat(Painter &p) const {
}
p.setPen(st::dialogsNameFg);
if (const auto peer = _searchInChat.peer()) {
if (const auto topic = _searchInChat.topic()) {
paintSearchInTopic(p, context, topic, _searchInChatUserpic, top, _searchInChatText);
} else if (const auto peer = _searchInChat.peer()) {
if (peer->isSelf()) {
paintSearchInSaved(p, top, _searchInChatText);
} else if (peer->isRepliesChat()) {
@@ -1035,6 +1044,21 @@ void InnerWidget::paintSearchInReplies(
paintSearchInFilter(p, paintUserpic, top, nullptr, text);
}
void InnerWidget::paintSearchInTopic(
Painter &p,
const Ui::PaintContext &context,
not_null<Data::ForumTopic*> topic,
std::shared_ptr<Data::CloudImageView> &userpic,
int top,
const Ui::Text::String &text) const {
const auto paintUserpic = [&](Painter &p, int x, int y, int size) {
p.translate(x, y);
topic->paintUserpic(p, userpic, context);
p.translate(-x, -y);
};
paintSearchInFilter(p, paintUserpic, top, nullptr, text);
}
void InnerWidget::mouseMoveEvent(QMouseEvent *e) {
const auto globalPosition = e->globalPos();
if (!_lastMousePosition) {
@@ -2313,9 +2337,9 @@ void InnerWidget::searchReceived(
const auto isMigratedSearch = (type == SearchRequestType::MigratedFromStart)
|| (type == SearchRequestType::MigratedFromOffset);
const auto key = _openedForum
? Key(_openedForum->history())
: _searchInChat;
const auto key = (!_openedForum || _searchInChat.topic())
? _searchInChat
: Key(_openedForum->history());
if (inject
&& (!_searchInChat
|| inject->history() == _searchInChat.history())) {
@@ -2600,7 +2624,9 @@ void InnerWidget::searchInChat(Key key, PeerData *from) {
void InnerWidget::refreshSearchInChatLabel() {
const auto dialog = [&] {
if (const auto peer = _searchInChat.peer()) {
if (const auto topic = _searchInChat.topic()) {
return topic->title();
} else if (const auto peer = _searchInChat.peer()) {
if (peer->isSelf()) {
return tr::lng_saved_messages(tr::now);
} else if (peer->isRepliesChat()) {