mirror of
https://github.com/telegramdesktop/tdesktop
synced 2025-09-01 15:05:56 +00:00
Fixed display of filters tabs on some cases of first activating.
This commit is contained in:
@@ -1321,24 +1321,28 @@ SessionController::SessionController(
|
|||||||
closeFolder();
|
closeFolder();
|
||||||
}, lifetime());
|
}, lifetime());
|
||||||
|
|
||||||
|
const auto processFiltersMenu = [this] {
|
||||||
|
if (SessionNavigation::session().data().chatsFilters().has()) {
|
||||||
|
const auto isHorizontal
|
||||||
|
= Core::App().settings().chatFiltersHorizontal()
|
||||||
|
|| !enoughSpaceForFilters();
|
||||||
|
content()->toggleFiltersMenu(isHorizontal);
|
||||||
|
toggleFiltersMenu(!isHorizontal);
|
||||||
|
} else {
|
||||||
|
content()->toggleFiltersMenu(false);
|
||||||
|
toggleFiltersMenu(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
rpl::merge(
|
rpl::merge(
|
||||||
enoughSpaceForFiltersValue() | rpl::skip(1) | rpl::to_empty,
|
enoughSpaceForFiltersValue() | rpl::skip(1) | rpl::to_empty,
|
||||||
Core::App().settings().chatFiltersHorizontalChanges() | rpl::to_empty,
|
Core::App().settings().chatFiltersHorizontalChanges() | rpl::to_empty,
|
||||||
session->data().chatsFilters().changed()
|
session->data().chatsFilters().changed()
|
||||||
) | rpl::start_with_next([=] {
|
) | rpl::start_with_next([=] {
|
||||||
|
if (!_filtersActivated) {
|
||||||
|
processFiltersMenu();
|
||||||
|
}
|
||||||
checkOpenedFilter();
|
checkOpenedFilter();
|
||||||
crl::on_main(this, [this] {
|
crl::on_main(this, processFiltersMenu);
|
||||||
if (SessionNavigation::session().data().chatsFilters().has()) {
|
|
||||||
const auto isHorizontal
|
|
||||||
= Core::App().settings().chatFiltersHorizontal()
|
|
||||||
|| !enoughSpaceForFilters();
|
|
||||||
content()->toggleFiltersMenu(isHorizontal);
|
|
||||||
toggleFiltersMenu(!isHorizontal);
|
|
||||||
} else {
|
|
||||||
content()->toggleFiltersMenu(false);
|
|
||||||
toggleFiltersMenu(false);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}, lifetime());
|
}, lifetime());
|
||||||
|
|
||||||
session->data().itemIdChanged(
|
session->data().itemIdChanged(
|
||||||
|
Reference in New Issue
Block a user