fanhuadesenlinnn/tdesktop
1
0
Fork 0
mirror of https://hubproxy.babadafafafafa.cn/https://github.com/telegramdesktop/tdesktop synced 2026-09-21 00:23:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve empty chat list layout.

Browse Source
This commit is contained in:
John Preston
2020-03-31 12:36:33 +04:00
parent 9ef41062d3
commit 69d3414594
4 changed files with 93 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "core/shortcuts.h"
#include "ui/widgets/buttons.h"
#include "ui/widgets/popup_menu.h"
#include "ui/text/text_utilities.h"
#include "ui/text_options.h"
#include "ui/ui_utility.h"
#include "data/data_drafts.h"
@@ -115,8 +116,6 @@ InnerWidget::InnerWidget(
, _pinnedShiftAnimation([=](crl::time now) {
return pinnedShiftAnimationCallback(now);
})
, _addContactLnk(this, tr::lng_add_contact_button(tr::now))
, _editFilterLnk(this, tr::lng_filters_context_edit(tr::now))
, _cancelSearchInChat(this, st::dialogsCancelSearchInPeer)
, _cancelSearchFromUser(this, st::dialogsCancelSearchInPeer) {
@@ -124,8 +123,6 @@ InnerWidget::InnerWidget(
setAttribute(Qt::WA_OpaquePaintEvent, true);
#endif // OS_MAC_OLD
_addContactLnk->addClickHandler([] { App::wnd()->onShowAddContact(); });
_editFilterLnk->addClickHandler([=] { editOpenedFilter(); });
_cancelSearchInChat->setClickedCallback([=] { cancelSearchInChat(); });
_cancelSearchInChat->hide();
_cancelSearchFromUser->setClickedCallback([=] {
@@ -146,6 +143,7 @@ InnerWidget::InnerWidget(
session().data().contactsLoaded().changes(
) | rpl::start_with_next([=] {
refresh();
refreshEmptyLabel();
}, lifetime());
session().data().itemRemoved(
@@ -188,7 +186,9 @@ InnerWidget::InnerWidget(
setupOnlineStatusCheck();
session().data().chatsListChanges(
rpl::merge(
session().data().chatsListChanges(),
session().data().chatsListLoadedEvents()
) | rpl::filter([=](Data::Folder *folder) {
return (folder == _openedFolder);
}) | rpl::start_with_next([=] {
@@ -498,19 +498,6 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
}
if (!otherStart) {
p.fillRect(dialogsClip, st::dialogsBg);
p.setFont(st::noContactsFont);
p.setPen(st::noContactsColor);
const auto phrase = _filterId
? (session().data().chatsList()->loaded()
? tr::lng_no_chats_filter(tr::now)
: tr::lng_contacts_loading(tr::now))
: session().data().contactsLoaded().current()
? tr::lng_no_chats(tr::now)
: tr::lng_contacts_loading(tr::now);
p.drawText(
QRect(0, 0, fullWidth, st::noContactsHeight - (session().data().contactsLoaded().current() ? st::noContactsFont->height : 0)),
phrase,
style::al_center);
}
} else if (_state == WidgetState::Filtered) {
if (!_hashtagResults.empty()) {
@@ -1410,8 +1397,7 @@ void InnerWidget::setSearchedPressed(int pressed) {
}
void InnerWidget::resizeEvent(QResizeEvent *e) {
_addContactLnk->move((width() - _addContactLnk->width()) / 2, (st::noContactsHeight + st::noContactsFont->height) / 2);
_editFilterLnk->move((width() - _editFilterLnk->width()) / 2, (st::noContactsHeight + st::noContactsFont->height) / 2);
resizeEmptyLabel();
const auto widthForCancelButton = qMax(width(), st::columnMinimalWidthLeft);
const auto left = widthForCancelButton - st::dialogsSearchInSkip - _cancelSearchInChat->width();
const auto top = (st::dialogsSearchInHeight - st::dialogsCancelSearchInPeer.height) / 2;
@@ -2200,19 +2186,12 @@ void InnerWidget::refresh(bool toTop) {
if (needCollapsedRowsRefresh()) {
return refreshWithCollapsedRows(toTop);
}
refreshEmptyLabel();
const auto list = shownDialogs();
_addContactLnk->setVisible(!_filterId
&& (_state == WidgetState::Default)
&& list->empty()
&& session().data().contactsLoaded().current());
_editFilterLnk->setVisible((_filterId > 0)
&& (_state == WidgetState::Default)
&& list->empty()
&& session().data().chatsList()->loaded());
auto h = 0;
if (_state == WidgetState::Default) {
if (list->empty()) {
h = st::noContactsHeight;
h = st::dialogsEmptyHeight;
} else {
h = dialogsOffset() + list->size() * st::dialogsRowHeight;
}
@@ -2235,6 +2214,69 @@ void InnerWidget::refresh(bool toTop) {
update();
}
void InnerWidget::refreshEmptyLabel() {
const auto data = &session().data();
const auto state = !shownDialogs()->empty()
? EmptyState::None
: (!_filterId && data->contactsLoaded().current())
? EmptyState::NoContacts
: (_filterId > 0) && data->chatsList()->loaded()
? EmptyState::EmptyFolder
: EmptyState::Loading;
if (state == EmptyState::None) {
_emptyState = state;
_empty.destroy();
return;
} else if (_emptyState == state) {
_empty->setVisible(_state == WidgetState::Default);
return;
}
_emptyState = state;
auto phrase = (state == EmptyState::NoContacts)
? tr::lng_no_chats()
: (state == EmptyState::EmptyFolder)
? tr::lng_no_chats_filter()
: tr::lng_contacts_loading();
auto link = (state == EmptyState::NoContacts)
? tr::lng_add_contact_button()
: (state == EmptyState::EmptyFolder)
? tr::lng_filters_context_edit()
: rpl::single(QString());
auto full = rpl::combine(
std::move(phrase),
std::move(link)
) | rpl::map([](const QString &phrase, const QString &link) {
auto result = Ui::Text::WithEntities(phrase);
if (!link.isEmpty()) {
result.append("\n\n").append(Ui::Text::Link(link));
}
return result;
});
_empty.create(this, std::move(full), st::dialogsEmptyLabel);
resizeEmptyLabel();
_empty->setClickHandlerFilter([=](const auto &...) {
if (_emptyState == EmptyState::NoContacts) {
App::wnd()->onShowAddContact();
} else if (_emptyState == EmptyState::EmptyFolder) {
editOpenedFilter();
}
return false;
});
_empty->setVisible(_state == WidgetState::Default);
}
void InnerWidget::resizeEmptyLabel() {
if (!_empty) {
return;
}
const auto useWidth = std::min(
_empty->naturalWidth(),
width() - 2 * st::dialogsEmptySkip);
const auto left = (width() - useWidth) / 2;
_empty->resizeToWidth(useWidth);
_empty->move(left, (st::dialogsEmptyHeight - _empty->height()) / 2);
}
void InnerWidget::clearMouseSelection(bool clearSelection) {
_mouseSelection = false;
_lastMousePosition = std::nullopt;
@@ -2580,6 +2622,7 @@ void InnerWidget::switchToFilter(FilterId filterId) {
_filterId = filterId;
refreshWithCollapsedRows(true);
}
refreshEmptyLabel();
}
bool InnerWidget::chooseHashtag() {