mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-02 07:35:12 +00:00
Code Issues Releases Wiki Activity

Active state for IconButton added, when ripple is not hidden.

Browse Source
This commit is contained in:
John Preston
2016-11-16 15:06:02 +03:00
parent 7fa274a68e
commit cdef9fa14f
14 changed files with 192 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Telegram/SourceFiles/dialogswidget.cpp
View File

@@ -1154,8 +1154,8 @@ bool DialogsInner::hasFilteredResults() const {
}
void DialogsInner::searchInPeer(PeerData *peer) {
_searchInPeer = peer ? (peer->migrateTo() ? peer->migrateTo() : peer) : 0;
_searchInMigrated = _searchInPeer ? _searchInPeer->migrateFrom() : 0;
_searchInPeer = peer ? (peer->migrateTo() ? peer->migrateTo() : peer) : nullptr;
_searchInMigrated = _searchInPeer ? _searchInPeer->migrateFrom() : nullptr;
if (_searchInPeer) {
onHashtagFilterUpdate(QStringRef());
_cancelSearchInPeer->show();
@@ -2021,9 +2021,7 @@ void DialogsWidget::searchMessages(const QString &query, PeerData *inPeer) {
if ((_filter->getLastText() != query) || (inPeer && inPeer != _searchInPeer && inPeer->migrateTo() != _searchInPeer)) {
if (inPeer) {
onCancelSearch();
_searchInPeer = inPeer->migrateTo() ? inPeer->migrateTo() : inPeer;
_searchInMigrated = _searchInPeer ? _searchInPeer->migrateFrom() : 0;
_inner->searchInPeer(_searchInPeer);
setSearchInPeer(inPeer);
}
_filter->setText(query);
_filter->updatePlaceholder();
@@ -2309,12 +2307,20 @@ void DialogsWidget::onFilterUpdate(bool force) {
void DialogsWidget::searchInPeer(PeerData *peer) {
onCancelSearch();
_searchInPeer = peer ? (peer->migrateTo() ? peer->migrateTo() : peer) : 0;
_searchInMigrated = _searchInPeer ? _searchInPeer->migrateFrom() : 0;
_inner->searchInPeer(_searchInPeer);
setSearchInPeer(peer);
onFilterUpdate(true);
}
void DialogsWidget::setSearchInPeer(PeerData *peer) {
auto newSearchInPeer = peer ? (peer->migrateTo() ? peer->migrateTo() : peer) : nullptr;
_searchInMigrated = newSearchInPeer ? newSearchInPeer->migrateFrom() : nullptr;
if (newSearchInPeer != _searchInPeer) {
_searchInPeer = newSearchInPeer;
App::main()->searchInPeerChanged().notify(_searchInPeer, true);
}
_inner->searchInPeer(_searchInPeer);
}
void DialogsWidget::onFilterCursorMoved(int from, int to) {
if (to < 0) to = _filter->cursorPosition();
QString t = _filter->getLastText();
@@ -2527,8 +2533,7 @@ bool DialogsWidget::onCancelSearch() {
if (Adaptive::OneColumn()) {
Ui::showPeerHistory(_searchInPeer, ShowAtUnreadMsgId);
}
_searchInPeer = _searchInMigrated = 0;
_inner->searchInPeer(0);
setSearchInPeer(nullptr);
clearing = true;
}
_inner->clearFilter();
@@ -2547,8 +2552,7 @@ void DialogsWidget::onCancelSearchInPeer() {
if (Adaptive::OneColumn() && !App::main()->selectingPeer()) {
Ui::showPeerHistory(_searchInPeer, ShowAtUnreadMsgId);
}
_searchInPeer = _searchInMigrated = 0;
_inner->searchInPeer(0);
setSearchInPeer(nullptr);
}
_inner->clearFilter();
_filter->clear();