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

Improve archive <-> filter navigation.

This commit is contained in:
John Preston 2020-03-20 17:12:13 +04:00
parent b8684af537
commit ab16e8e083
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -382,7 +382,6 @@ void InnerWidget::changeOpenedFolder(Data::Folder *folder) {
//const auto lastMousePosition = _lastMousePosition; //const auto lastMousePosition = _lastMousePosition;
clearSelection(); clearSelection();
_openedFolder = folder; _openedFolder = folder;
_filterId = _openedFolder ? 0 : _controller->activeChatsFilterCurrent();
refreshWithCollapsedRows(true); refreshWithCollapsedRows(true);
// This doesn't work, because we clear selection in leaveEvent on hide. // This doesn't work, because we clear selection in leaveEvent on hide.
//if (mouseSelection && lastMousePosition) { //if (mouseSelection && lastMousePosition) {
@ -2258,9 +2257,7 @@ void InnerWidget::searchInChat(Key key, UserData *from) {
_searchInChat = key; _searchInChat = key;
_searchFromUser = from; _searchFromUser = from;
if (_searchInChat) { if (_searchInChat) {
if (_openedFolder) { _controller->closeFolder();
changeOpenedFolder(nullptr);
}
onHashtagFilterUpdate(QStringRef()); onHashtagFilterUpdate(QStringRef());
_cancelSearchInChat->show(); _cancelSearchInChat->show();
refreshSearchInChatLabel(); refreshSearchInChatLabel();
@ -2549,7 +2546,6 @@ bool InnerWidget::chooseCollapsedRow() {
} }
void InnerWidget::switchToFilter(FilterId filterId) { void InnerWidget::switchToFilter(FilterId filterId) {
clearSelection();
const auto found = ranges::contains( const auto found = ranges::contains(
session().data().chatsFilters().list(), session().data().chatsFilters().list(),
filterId, filterId,
@ -2557,9 +2553,17 @@ void InnerWidget::switchToFilter(FilterId filterId) {
if (!found) { if (!found) {
filterId = 0; filterId = 0;
} }
stopReorderPinned(); if (_filterId == filterId) {
_filterId = filterId; return;
refreshWithCollapsedRows(true); }
if (_openedFolder) {
_filterId = filterId;
} else {
clearSelection();
stopReorderPinned();
_filterId = filterId;
refreshWithCollapsedRows(true);
}
} }
bool InnerWidget::chooseHashtag() { bool InnerWidget::chooseHashtag() {

4
Telegram/SourceFiles/window/window_session_controller.cpp
View File

@ -244,6 +244,7 @@ bool SessionController::uniqueChatsInSearchResults() const {
} }
void SessionController::openFolder(not_null<Data::Folder*> folder) { void SessionController::openFolder(not_null<Data::Folder*> folder) {
setActiveChatsFilter(0);
_openedFolder = folder.get(); _openedFolder = folder.get();
} }
@ -775,6 +776,9 @@ FilterId SessionController::activeChatsFilterCurrent() const {
void SessionController::setActiveChatsFilter(FilterId id) { void SessionController::setActiveChatsFilter(FilterId id) {
_activeChatsFilter = id; _activeChatsFilter = id;
if (id) {
closeFolder();
}
} }
SessionController::~SessionController() = default; SessionController::~SessionController() = default;