new emojis rendered

Telegram/SourceFiles/gui/emoji_config.h

@@ -22,6 +22,8 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 void initEmoji();
 EmojiPtr getEmoji(uint32 code);
 
+extern int EmojiSizes[5], ESize;
+
 void findEmoji(const QChar *ch, const QChar *e, const QChar *&newEmojiEnd, uint32 &emojiCode);
 
 inline bool emojiEdge(const QChar *ch) {

Telegram/SourceFiles/settings.h

@@ -153,15 +153,17 @@ T convertScale(T v) {
 DeclareSetting(DBIEmojiTab, EmojiTab);
 
 struct EmojiData {
-	EmojiData(uint16 x, uint16 y, uint32 code, uint32 code2, uint16 len, uint16 postfix = 0) : x(x), y(y), code(code), code2(code2), len(len), postfix(postfix) {
+	EmojiData(uint16 x, uint16 y, uint32 code, uint32 code2, uint16 len, uint16 postfix, uint32 color) : x(x), y(y), code(code), code2(code2), len(len), postfix(postfix), color(color) {
 	}
 	uint16 x, y;
 	uint32 code, code2;
 	uint16 len;
 	uint16 postfix;
+	uint32 color;
 };
 
 typedef const EmojiData *EmojiPtr;
+static EmojiPtr TwoSymbolEmoji = EmojiPtr(0x01);
 
 typedef QVector<EmojiPtr> EmojiPack;
 typedef QVector<QPair<uint32, ushort> > RecentEmojiPreload;

Telegram/SourceFiles/types.h

@@ -317,14 +317,23 @@ enum DBIScale {
 	dbisScaleCount    = 5,
 };
 
+writeEmojiCategory(tcpp, emojiCategory1, sizeof(emojiCategory1) / sizeof(emojiCategory1[0]), "People");
+writeEmojiCategory(tcpp, emojiCategory2, sizeof(emojiCategory2) / sizeof(emojiCategory2[0]), "Nature");
+writeEmojiCategory(tcpp, emojiCategory3, sizeof(emojiCategory3) / sizeof(emojiCategory3[0]), "Food");
+writeEmojiCategory(tcpp, emojiCategory4, sizeof(emojiCategory4) / sizeof(emojiCategory4[0]), "Celebration");
+writeEmojiCategory(tcpp, emojiCategory5, sizeof(emojiCategory5) / sizeof(emojiCategory5[0]), "Activity");
+writeEmojiCategory(tcpp, emojiCategory6, sizeof(emojiCategory6) / sizeof(emojiCategory6[0]), "Travel");
+writeEmojiCategory(tcpp, emojiCategory7, sizeof(emojiCategory7) / sizeof(emojiCategory7[0]), "Objects");
 enum DBIEmojiTab {
-	dbietRecent   = -1,
-	dbietPeople   =  0,
-	dbietNature   =  1,
-	dbietObjects  =  2,
-	dbietPlaces   =  3,
-	dbietSymbols  =  4,
-	dbietStickers =  666,
+	dbietRecent      = -1,
+	dbietPeople      =  0,
+	dbietNature      =  1,
+	dbietFood        =  2,
+	dbietCelebration =  3,
+	dbietActivity    =  4,
+	dbietTravel      =  5,
+	dbietObjects     =  6,
+	dbietStickers    =  666,
 };
 
 enum DBIPlatform {