From adbe5e9605af1a6b79c14498939d5dc5e59bb297 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Thu, 7 Sep 2023 12:29:55 +0300 Subject: [PATCH] Slightly improved style of mini icons in dialogs list. --- Telegram/SourceFiles/dialogs/dialogs.style | 1 + Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style index 854faef97a..729ef06628 100644 --- a/Telegram/SourceFiles/dialogs/dialogs.style +++ b/Telegram/SourceFiles/dialogs/dialogs.style @@ -468,6 +468,7 @@ dialogsMiniForwardIcon: ThreeStateIcon { active: icon {{ "mini_forward", dialogsTextFgActive, point(0px, 1px) }}; } dialogsMiniIconSkip: 2px; +dialogsMiniIconTextSkip: 1px; dialogsMiniReplyStoryIcon: ThreeStateIcon { icon: icon {{ "mini_reply_story", dialogsTextFg, point(0px, 1px) }}; over: icon {{ "mini_reply_story", dialogsTextFgOver, point(0px, 1px) }}; diff --git a/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp b/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp index 6f4700f2c6..ca23562cb9 100644 --- a/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp +++ b/Telegram/SourceFiles/dialogs/ui/dialogs_message_view.cpp @@ -316,7 +316,7 @@ void MessageView::paint( .elisionLines = lines, }); rect.setLeft(rect.x() + _senderCache.maxWidth()); - if (!_imagesCache.empty()) { + if (!_imagesCache.empty() && !_leftIcon) { const auto skip = st::dialogsMiniPreviewSkip + st::dialogsMiniPreviewRight; rect.setLeft(rect.x() + skip); @@ -339,7 +339,11 @@ void MessageView::paint( } else { icon.paint(p, rect.topLeft(), rect.width()); } - rect.setLeft(rect.x() + w + st::dialogsMiniIconSkip); + rect.setLeft(rect.x() + + w + + (_imagesCache.empty() + ? st::dialogsMiniIconTextSkip + : st::dialogsMiniIconSkip)); } } for (const auto &image : _imagesCache) {