From 0d290a2c287cbf8fa581113d75b10f98552253a8 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 11 Jan 2019 15:32:25 +0400 Subject: [PATCH] Fix emoji icon in theme preview. Fixes #5561. --- .../SourceFiles/window/themes/window_theme_preview.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Telegram/SourceFiles/window/themes/window_theme_preview.cpp b/Telegram/SourceFiles/window/themes/window_theme_preview.cpp index df01f6af3..2091becd8 100644 --- a/Telegram/SourceFiles/window/themes/window_theme_preview.cpp +++ b/Telegram/SourceFiles/window/themes/window_theme_preview.cpp @@ -476,10 +476,16 @@ void Generator::paintComposeArea() { auto right = st::historySendRight + st::historySendSize.width(); st::historyRecordVoice[_palette].paintInCenter(*_p, QRect(_composeArea.x() + _composeArea.width() - right, controlsTop, st::historySendSize.width(), st::historySendSize.height())); + const auto emojiIconLeft = (st::historyAttachEmoji.iconPosition.x() < 0) + ? ((st::historyAttachEmoji.width - st::historyAttachEmoji.icon.width()) / 2) + : st::historyAttachEmoji.iconPosition.x(); + const auto emojiIconTop = (st::historyAttachEmoji.iconPosition.y() < 0) + ? ((st::historyAttachEmoji.height - st::historyAttachEmoji.icon.height()) / 2) + : st::historyAttachEmoji.iconPosition.y(); right += st::historyAttachEmoji.width; auto attachEmojiLeft = _composeArea.x() + _composeArea.width() - right; _p->fillRect(attachEmojiLeft, controlsTop, st::historyAttachEmoji.width, st::historyAttachEmoji.height, st::historyComposeAreaBg[_palette]); - st::historyAttachEmoji.icon[_palette].paint(*_p, attachEmojiLeft + st::historyAttachEmoji.iconPosition.x(), controlsTop + st::historyAttachEmoji.iconPosition.y(), _rect.width()); + st::historyAttachEmoji.icon[_palette].paint(*_p, attachEmojiLeft + emojiIconLeft, controlsTop + emojiIconTop, _rect.width()); auto pen = st::historyEmojiCircleFg[_palette]->p; pen.setWidth(st::historyEmojiCircleLine);