mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-05 00:46:08 +00:00
Code Issues Releases Wiki Activity

Added ability to move archive in main menu.

Browse Source 
- Added Folder::paintUserpic overload for custom color.
 - Reduced size of _cloudButton.
This commit is contained in:
23rd
2019-05-16 11:39:45 +03:00
committed by John Preston
parent 484ecffb66
commit ece315f3c5
10 changed files with 151 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -217,6 +217,11 @@ InnerWidget::InnerWidget(
refreshWithCollapsedRows();
}, lifetime());
session().settings().archiveInMainMenuChanges(
) | rpl::start_with_next([=] {
refreshWithCollapsedRows();
}, lifetime());
subscribe(Window::Theme::Background(), [=](const Window::Theme::BackgroundUpdate &data) {
if (data.paletteChanged()) {
Layout::clearUnreadBadgesCache();
@@ -302,7 +307,8 @@ void InnerWidget::refreshWithCollapsedRows(bool toTop) {
const auto archive = !list->empty()
? (*list->begin())->folder()
: nullptr;
if (archive && session().settings().archiveCollapsed()) {
if (archive && session().settings().archiveCollapsed()
&& !session().settings().archiveInMainMenu()) {
if (_selected && _selected->folder() == archive) {
_selected = nullptr;
}
@@ -2105,8 +2111,9 @@ Data::Folder *InnerWidget::shownFolder() const {
}
bool InnerWidget::needCollapsedRowsRefresh() const {
const auto archive = !shownDialogs()->empty()
? (*shownDialogs()->begin())->folder()
const auto list = shownDialogs();
const auto archive = !list->empty()
? (*list->begin())->folder()
: nullptr;
const auto collapsedHasArchive = !_collapsedRows.empty()
&& (_collapsedRows.back()->folder != nullptr);