mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 14:38:15 +00:00
Code Issues Releases Wiki Activity

Version bumped to 0.9.61 stable.

Browse Source 
Merge branch 'archived_stickers' into cancel_reset.

Conflicts:
	Telegram/Resources/winrc/Telegram.rc
	Telegram/Resources/winrc/Updater.rc
	Telegram/SourceFiles/app.cpp
	Telegram/SourceFiles/core/version.h
	Telegram/SourceFiles/localstorage.cpp
	Telegram/Telegram.vcxproj.filters
	Telegram/Telegram.xcodeproj/project.pbxproj
	Telegram/build/version
This commit is contained in:
John Preston
2016-07-25 22:54:40 +03:00
parent 75ff3c3d28 02e54dd8ba
commit dbdf28d0a0
61 changed files with 3998 additions and 1344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Telegram/SourceFiles/history/field_autocomplete.cpp
View File

@@ -153,15 +153,15 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) {
StickerPack srows;
if (_emoji) {
QMap<uint64, uint64> setsToRequest;
Stickers::Sets &sets(Global::RefStickerSets());
const Stickers::Order &order(Global::StickerSetsOrder());
auto &sets = Global::RefStickerSets();
auto &order = Global::StickerSetsOrder();
for (int i = 0, l = order.size(); i < l; ++i) {
auto it = sets.find(order.at(i));
if (it != sets.cend()) {
if (it->emoji.isEmpty()) {
setsToRequest.insert(it->id, it->access);
it->flags |= MTPDstickerSet_ClientFlag::f_not_loaded;
} else if (!(it->flags & MTPDstickerSet::Flag::f_disabled)) {
} else if (!(it->flags & MTPDstickerSet::Flag::f_archived)) {
StickersByEmojiMap::const_iterator i = it->emoji.constFind(emojiGetNoColor(_emoji));
if (i != it->emoji.cend()) {
srows += *i;
@@ -196,14 +196,14 @@ void FieldAutocomplete::updateFiltered(bool resetScroll) {
}
return true;
};
auto filterNotPassedByName = [this](UserData *user) -> bool {
auto filterNotPassedByName = [this, &filterNotPassedByUsername](UserData *user) -> bool {
for_const (auto &namePart, user->names) {
if (namePart.startsWith(_filter, Qt::CaseInsensitive)) {
bool exactUsername = (user->username.compare(_filter, Qt::CaseInsensitive) == 0);
return exactUsername;
}
}
return true;
return filterNotPassedByUsername(user);
};
bool listAllSuggestions = _filter.isEmpty();