mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 06:26:18 +00:00
Code Issues Releases Wiki Activity

Support search in feed + scroll to search result.

Browse Source
This commit is contained in:
John Preston
2018-02-16 18:46:24 +03:00
parent bc171f625a
commit 07528be1e6
16 changed files with 225 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Telegram/SourceFiles/info/info_wrap_widget.cpp
View File

@@ -199,9 +199,9 @@ Key WrapWidget::key() const {
Dialogs::RowDescriptor WrapWidget::activeChat() const {
if (const auto peer = key().peer()) {
return Dialogs::RowDescriptor(App::history(peer), MsgId(0));
return Dialogs::RowDescriptor(App::history(peer), FullMsgId());
} else if (const auto feed = key().feed()) {
return Dialogs::RowDescriptor(feed, MsgId(0));
return Dialogs::RowDescriptor(feed, FullMsgId());
}
Unexpected("Owner in WrapWidget::activeChat().");
}
@@ -497,18 +497,27 @@ void WrapWidget::showProfileMenu() {
});
_topBarMenuToggle->installEventFilter(_topBarMenu.get());
// #TODO feeds menu
const auto peer = key().peer();
if (!peer) {
const auto addAction = [=](
const QString &text,
base::lambda<void()> callback) {
return _topBarMenu->addAction(text, std::move(callback));
};
if (const auto peer = key().peer()) {
Window::FillPeerMenu(
_controller->parentController(),
peer,
addAction,
Window::PeerMenuSource::Profile);
} else if (const auto feed = key().feed()) {
Window::FillFeedMenu(
_controller->parentController(),
feed,
addAction,
Window::PeerMenuSource::Profile);
} else {
_topBarMenu = nullptr;
return;
}
Window::FillPeerMenu(
_controller->parentController(),
peer,
[this](const QString &text, base::lambda<void()> callback) {
return _topBarMenu->addAction(text, std::move(callback));
},
Window::PeerMenuSource::Profile);
auto position = (wrap() == Wrap::Layer)
? st::infoLayerTopBarMenuPosition
: st::infoTopBarMenuPosition;