procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Refactored skipping of rows in Dialogs::InnerWidget.

This commit is contained in:
23rd 2019-06-08 21:11:33 +03:00 committed by John Preston
parent ece315f3c5
commit 734ecc070b
3 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/Resources/langs/lang.strings
View File

@ -1319,7 +1319,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
"lng_context_archive_collapse" = "Collapse"; "lng_context_archive_collapse" = "Collapse";
"lng_context_archive_to_menu" = "Move to main menu"; "lng_context_archive_to_menu" = "Move to main menu";
"lng_context_archive_to_list" = "Move to chats list"; "lng_context_archive_to_list" = "Move to chats list";
"lng_context_archive_to_menu_info" = "Archive moved in the main menu!\nYou can return it with context menu of archive button."; "lng_context_archive_to_menu_info" = "Archive moved to the main menu!\nYou can return it from the context menu of the archive button.";
"lng_context_promote_admin" = "Promote to admin"; "lng_context_promote_admin" = "Promote to admin";
"lng_context_edit_permissions" = "Edit permissions"; "lng_context_edit_permissions" = "Edit permissions";

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

@ -219,7 +219,7 @@ InnerWidget::InnerWidget(
session().settings().archiveInMainMenuChanges( session().settings().archiveInMainMenuChanges(
) | rpl::start_with_next([=] { ) | rpl::start_with_next([=] {
refreshWithCollapsedRows(); refresh();
}, lifetime()); }, lifetime());
subscribe(Window::Theme::Background(), [=](const Window::Theme::BackgroundUpdate &data) { subscribe(Window::Theme::Background(), [=](const Window::Theme::BackgroundUpdate &data) {
@ -307,20 +307,23 @@ void InnerWidget::refreshWithCollapsedRows(bool toTop) {
const auto archive = !list->empty() const auto archive = !list->empty()
? (*list->begin())->folder() ? (*list->begin())->folder()
: nullptr; : nullptr;
if (archive && session().settings().archiveCollapsed() const auto inMainMenu = session().settings().archiveInMainMenu();
&& !session().settings().archiveInMainMenu()) { if (archive && (session().settings().archiveCollapsed() || inMainMenu)) {
if (_selected && _selected->folder() == archive) { if (_selected && _selected->folder() == archive) {
_selected = nullptr; _selected = nullptr;
} }
if (_pressed && _pressed->folder() == archive) { if (_pressed && _pressed->folder() == archive) {
setPressed(nullptr); setPressed(nullptr);
} }
_skipByCollapsedRows = 1; _skipTopDialogs = 1;
if (!inMainMenu) {
_collapsedRows.push_back(std::make_unique<CollapsedRow>(archive)); _collapsedRows.push_back(std::make_unique<CollapsedRow>(archive));
}
} else { } else {
_skipByCollapsedRows = 0; _skipTopDialogs = 0;
} }
Assert(!needCollapsedRowsRefresh());
refresh(toTop); refresh(toTop);
if (selected >= 0 && selected < _collapsedRows.size()) { if (selected >= 0 && selected < _collapsedRows.size()) {
@ -333,7 +336,7 @@ void InnerWidget::refreshWithCollapsedRows(bool toTop) {
int InnerWidget::dialogsOffset() const { int InnerWidget::dialogsOffset() const {
return _collapsedRows.size() * st::dialogsImportantBarHeight return _collapsedRows.size() * st::dialogsImportantBarHeight
- _skipByCollapsedRows * st::dialogsRowHeight; - _skipTopDialogs * st::dialogsRowHeight;
} }
int InnerWidget::fixedOnTopCount() const { int InnerWidget::fixedOnTopCount() const {
@ -412,7 +415,7 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
const auto rows = shownDialogs(); const auto rows = shownDialogs();
const auto &list = rows->all(); const auto &list = rows->all();
const auto otherStart = std::max(int(rows->size()) - _skipByCollapsedRows, 0) * st::dialogsRowHeight; const auto otherStart = std::max(int(rows->size()) - _skipTopDialogs, 0) * st::dialogsRowHeight;
const auto active = activeEntry.key; const auto active = activeEntry.key;
const auto selected = _menuRow.key const auto selected = _menuRow.key
? _menuRow.key ? _menuRow.key
@ -456,7 +459,7 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
}; };
auto i = list.cfind(dialogsClip.top() - skip, st::dialogsRowHeight); auto i = list.cfind(dialogsClip.top() - skip, st::dialogsRowHeight);
while (i != list.cend() && (*i)->pos() < _skipByCollapsedRows) { while (i != list.cend() && (*i)->pos() < _skipTopDialogs) {
++i; ++i;
} }
if (i != list.cend()) { if (i != list.cend()) {
@ -464,13 +467,13 @@ void InnerWidget::paintEvent(QPaintEvent *e) {
// If we're reordering pinned chats we need to fill this area background first. // If we're reordering pinned chats we need to fill this area background first.
if (reorderingPinned) { if (reorderingPinned) {
p.fillRect(0, (promoted - _skipByCollapsedRows) * st::dialogsRowHeight, fullWidth, st::dialogsRowHeight * _pinnedRows.size(), st::dialogsBg); p.fillRect(0, (promoted - _skipTopDialogs) * st::dialogsRowHeight, fullWidth, st::dialogsRowHeight * _pinnedRows.size(), st::dialogsBg);
} }
p.translate(0, (lastPaintedPos - _skipByCollapsedRows) * st::dialogsRowHeight); p.translate(0, (lastPaintedPos - _skipTopDialogs) * st::dialogsRowHeight);
for (auto e = list.cend(); i != e; ++i) { for (auto e = list.cend(); i != e; ++i) {
auto row = (*i); auto row = (*i);
if ((lastPaintedPos - _skipByCollapsedRows) * st::dialogsRowHeight >= dialogsClip.top() - skip + dialogsClip.height()) { if ((lastPaintedPos - _skipTopDialogs) * st::dialogsRowHeight >= dialogsClip.top() - skip + dialogsClip.height()) {
break; break;
} }
@ -2119,9 +2122,13 @@ bool InnerWidget::needCollapsedRowsRefresh() const {
&& (_collapsedRows.back()->folder != nullptr); && (_collapsedRows.back()->folder != nullptr);
const auto archiveIsCollapsed = (archive != nullptr) const auto archiveIsCollapsed = (archive != nullptr)
&& session().settings().archiveCollapsed(); && session().settings().archiveCollapsed();
return archiveIsCollapsed const auto archiveIsInMainMenu = (archive != nullptr)
? (!collapsedHasArchive || _skipByCollapsedRows != 1) && session().settings().archiveInMainMenu();
: (collapsedHasArchive || _skipByCollapsedRows != 0); return archiveIsInMainMenu
? (collapsedHasArchive || _skipTopDialogs != 1)
: archiveIsCollapsed
? (!collapsedHasArchive || _skipTopDialogs != 1)
: (collapsedHasArchive || _skipTopDialogs != 0);
} }
void InnerWidget::refresh(bool toTop) { void InnerWidget::refresh(bool toTop) {
@ -2277,27 +2284,27 @@ void InnerWidget::selectSkip(int32 direction) {
clearMouseSelection(); clearMouseSelection();
if (_state == WidgetState::Default) { if (_state == WidgetState::Default) {
const auto list = shownDialogs(); const auto list = shownDialogs();
if (_collapsedRows.empty() && list->size() <= _skipByCollapsedRows) { if (_collapsedRows.empty() && list->size() <= _skipTopDialogs) {
return; return;
} }
if (_collapsedSelected < 0 && !_selected) { if (_collapsedSelected < 0 && !_selected) {
if (!_collapsedRows.empty()) { if (!_collapsedRows.empty()) {
_collapsedSelected = 0; _collapsedSelected = 0;
} else { } else {
_selected = *(list->cbegin() + _skipByCollapsedRows); _selected = *(list->cbegin() + _skipTopDialogs);
} }
} else { } else {
auto cur = (_collapsedSelected >= 0) auto cur = (_collapsedSelected >= 0)
? _collapsedSelected ? _collapsedSelected
: int(_collapsedRows.size() : int(_collapsedRows.size()
+ (list->cfind(_selected) - list->cbegin() - _skipByCollapsedRows)); + (list->cfind(_selected) - list->cbegin() - _skipTopDialogs));
cur = snap(cur + direction, 0, static_cast<int>(_collapsedRows.size() + list->size() - _skipByCollapsedRows - 1)); cur = snap(cur + direction, 0, static_cast<int>(_collapsedRows.size() + list->size() - _skipTopDialogs - 1));
if (cur < _collapsedRows.size()) { if (cur < _collapsedRows.size()) {
_collapsedSelected = cur; _collapsedSelected = cur;
_selected = nullptr; _selected = nullptr;
} else { } else {
_collapsedSelected = -1; _collapsedSelected = -1;
_selected = *(list->cbegin() + _skipByCollapsedRows + cur - _collapsedRows.size()); _selected = *(list->cbegin() + _skipTopDialogs + cur - _collapsedRows.size());
} }
} }
if (_collapsedSelected >= 0 || _selected) { if (_collapsedSelected >= 0 || _selected) {
@ -2391,8 +2398,8 @@ void InnerWidget::selectSkipPage(int32 pixels, int32 direction) {
int toSkip = pixels / int(st::dialogsRowHeight); int toSkip = pixels / int(st::dialogsRowHeight);
if (_state == WidgetState::Default) { if (_state == WidgetState::Default) {
if (!_selected) { if (!_selected) {
if (direction > 0 && shownDialogs()->size() > _skipByCollapsedRows) { if (direction > 0 && shownDialogs()->size() > _skipTopDialogs) {
_selected = *(shownDialogs()->cbegin() + _skipByCollapsedRows); _selected = *(shownDialogs()->cbegin() + _skipTopDialogs);
_collapsedSelected = -1; _collapsedSelected = -1;
} else { } else {
return; return;
@ -2403,7 +2410,7 @@ void InnerWidget::selectSkipPage(int32 pixels, int32 direction) {
_selected = *i; _selected = *i;
} }
} else { } else {
for (auto i = shownDialogs()->cfind(_selected), b = shownDialogs()->cbegin(); i != b && (*i)->pos() > _skipByCollapsedRows && (toSkip--);) { for (auto i = shownDialogs()->cfind(_selected), b = shownDialogs()->cbegin(); i != b && (*i)->pos() > _skipTopDialogs && (toSkip--);) {
_selected = *(--i); _selected = *(--i);
} }
if (toSkip && !_collapsedRows.empty()) { if (toSkip && !_collapsedRows.empty()) {

2
Telegram/SourceFiles/dialogs/dialogs_inner_widget.h
View File

@ -305,7 +305,7 @@ private:
std::vector<std::unique_ptr<CollapsedRow>> _collapsedRows; std::vector<std::unique_ptr<CollapsedRow>> _collapsedRows;
int _collapsedSelected = -1; int _collapsedSelected = -1;
int _collapsedPressed = -1; int _collapsedPressed = -1;
int _skipByCollapsedRows = 0; int _skipTopDialogs = 0;
Row *_selected = nullptr; Row *_selected = nullptr;
Row *_pressed = nullptr; Row *_pressed = nullptr;