mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-10-03 13:26:03 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'tdesktop/dev' into dev

Browse Source
This commit is contained in:
RadRussianRus
2020-03-30 22:02:19 +03:00
parent 1fa9e981ec f4822cf558
commit 8aa9c4aa6d
35 changed files with 542 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1278,7 +1278,8 @@ bool InnerWidget::updateReorderPinned(QPoint localPosition) {
const auto delta = [&] {
if (localPosition.y() < _visibleTop) {
return localPosition.y() - _visibleTop;
} else if (_openedFolder && localPosition.y() > _visibleBottom) {
} else if ((_openedFolder || _filterId)
&& localPosition.y() > _visibleBottom) {
return localPosition.y() - _visibleBottom;
}
return 0;
@@ -3074,6 +3075,54 @@ void InnerWidget::setupShortcuts() {
return jumpToDialogRow({ row->key(), FullMsgId() });
});
}
auto &&folders = ranges::view::zip(
Shortcuts::kShowFolder,
ranges::view::ints(0, ranges::unreachable));
for (const auto [command, index] : folders) {
request->check(command) && request->handle([=, index = index] {
const auto list = &session().data().chatsFilters().list();
if (index >= list->size()) {
return false;
}
const auto filterId = list->at(index).id();
_controller->setActiveChatsFilter((filterId == _filterId)
? 0
: filterId);
return true;
});
}
const auto nearFolder = [=](bool isNext) {
const auto id = _controller->activeChatsFilterCurrent();
const auto list = &session().data().chatsFilters().list();
const auto it = (id == 0)
? begin(*list) - 1
: ranges::find(*list, id, &Data::ChatFilter::id);
if (it == end(*list) && id != 0) {
return false;
}
const auto i = isNext ? 1 : -1;
const auto index = it - begin(*list) + i;
if (index >= (int)list->size() || index < -1) {
return false;
}
const auto filterId = (index == -1)
? 0
: list->at(index).id();
_controller->setActiveChatsFilter(filterId);
return true;
};
request->check(Command::FolderNext) && request->handle([=] {
return nearFolder(true);
});
request->check(Command::FolderPrevious) && request->handle([=] {
return nearFolder(false);
});
if (session().supportMode() && row.key.history()) {
request->check(
Command::SupportScrollToCurrent