RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-02-19 06:26:55 +00:00
Code Issues Projects Releases Wiki Activity

Fix crash in EmojiListWidget.

Browse Source 
Changing recent emoji list was giving us inconsistent emoji list
in _emoji[section] and its size in SectionInfo::count field.
This commit is contained in:
John Preston 2017-04-01 17:08:56 +03:00
parent f1718f1d10
commit 7a7f157a8e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Telegram/SourceFiles/stickers/emoji_list_widget.cpp
View File

@ -342,7 +342,7 @@ bool EmojiListWidget::enumerateSections(Callback callback) const {
auto info = SectionInfo();
for (auto i = 0; i != kEmojiSectionCount; ++i) {
info.section = i;
info.count = Ui::Emoji::GetSectionCount(static_cast<Section>(i));
info.count = _counts[i];
info.rowsCount = (info.count / kEmojiPanelPerRow) + ((info.count % kEmojiPanelPerRow) ? 1 : 0);
info.rowsTop = info.top + (i == 0 ? st::emojiPanPadding : st::emojiPanHeader);
info.rowsBottom = info.rowsTop + info.rowsCount * st::emojiPanSize.height();
@ -389,6 +389,7 @@ void EmojiListWidget::ensureLoaded(int section) {
return;
}
_emoji[section] = Ui::Emoji::GetSection(static_cast<Section>(section));
_counts[section] = _emoji[section].size();
if (static_cast<Section>(section) == Section::Recent) {
return;
}
@ -677,8 +678,8 @@ void EmojiListWidget::processHideFinished() {
void EmojiListWidget::refreshRecent() {
clearSelection();
_counts[0] = Ui::Emoji::GetSectionCount(Section::Recent);
_emoji[0] = Ui::Emoji::GetSection(Section::Recent);
_counts[0] = _emoji[0].size();
auto h = countHeight();
if (h != height()) {
resize(width(), h);