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

Merged with master.

Browse Source
This commit is contained in:
John Preston
2016-04-01 12:54:32 +04:00
parent 8cde13fb8c 174302a907
commit fa4137418a
35 changed files with 771 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/dropdown.cpp
View File

@@ -941,6 +941,8 @@ void EmojiPanInner::selectEmoji(EmojiPtr emoji) {
}
void EmojiPanInner::onShowPicker() {
if (_pickerSel < 0) return;
int tab = (_pickerSel / MatrixRowShift), sel = _pickerSel % MatrixRowShift;
if (tab < emojiTabCount && sel < _emojis[tab].size() && _emojis[tab][sel]->color) {
int32 y = 0;