2
0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 14:45:14 +00:00

Merge branch 'emojis' into dev

This commit is contained in:
John Preston
2015-05-08 16:02:33 +03:00
42 changed files with 5919 additions and 6431 deletions

View File

@@ -156,7 +156,8 @@ namespace App {
const QPixmap &sprite();
const QPixmap &emojis();
const QPixmap &emojiSingle(const EmojiData *emoji, int32 fontHeight);
const QPixmap &emojisLarge();
const QPixmap &emojiSingle(EmojiPtr emoji, int32 fontHeight);
void initMedia();
void deinitMedia(bool completely = true);