From cfbbce26c42612a2af42f1fca9eed0669bf45586 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Mon, 31 May 2021 20:13:18 +0300 Subject: [PATCH] Added suitable name for floating badge colors. --- Telegram/SourceFiles/boxes/boxes.style | 6 +++--- Telegram/SourceFiles/boxes/edit_caption_box.cpp | 2 +- .../SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp | 2 +- .../ui/chat/attach/attach_single_media_preview.cpp | 2 +- Telegram/lib_ui | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style index 2e6ee6905..a8d865948 100644 --- a/Telegram/SourceFiles/boxes/boxes.style +++ b/Telegram/SourceFiles/boxes/boxes.style @@ -433,7 +433,7 @@ editMediaButtonFileSkipRight: 1px; editMediaButtonFileSkipTop: 7px; editMediaButtonIconFile: icon {{ "settings_edit", menuIconFg }}; -editMediaButtonIconPhoto: icon {{ "settings_edit", msgServiceFg }}; +editMediaButtonIconPhoto: icon {{ "settings_edit", roundedFg }}; editMediaButton: IconButton { width: editMediaButtonSize; height: editMediaButtonSize; @@ -464,8 +464,8 @@ sendBoxAlbumGroupButtonFile: IconButton(editMediaButton) { sendBoxAlbumGroupEditButtonIconFile: editMediaButtonIconFile; sendBoxAlbumGroupDeleteButtonIconFile: icon {{ "history_file_cancel", menuIconFg, point(6px, 6px) }}; -sendBoxAlbumGroupButtonMediaEdit: icon {{ "settings_edit", msgServiceFg, point(3px, -2px) }}; -sendBoxAlbumGroupButtonMediaDelete: icon {{ "history_file_cancel", msgServiceFg, point(2px, 5px) }}; +sendBoxAlbumGroupButtonMediaEdit: icon {{ "settings_edit", roundedFg, point(3px, -2px) }}; +sendBoxAlbumGroupButtonMediaDelete: icon {{ "history_file_cancel", roundedFg, point(2px, 5px) }}; sendBoxAlbumGroupButtonMedia: IconButton { width: sendBoxAlbumGroupHeight; height: sendBoxAlbumGroupHeight; diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp index e295a6e11..b7b20aa91 100644 --- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp +++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp @@ -621,7 +621,7 @@ void EditCaptionBox::updateEditMediaButton() { const auto icon = _doc ? &st::editMediaButtonIconFile : &st::editMediaButtonIconPhoto; - const auto color = _doc ? &st::windowBgRipple : &st::callFingerprintBg; + const auto color = _doc ? &st::windowBgRipple : &st::roundedBg; _editMedia->setIconOverride(icon); _editMedia->setRippleColorOverride(color); _editMedia->setForceRippled(!_doc, anim::type::instant); diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp index ab8c8f4ce..90a5289ce 100644 --- a/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp +++ b/Telegram/SourceFiles/ui/chat/attach/attach_album_thumbnail.cpp @@ -30,7 +30,7 @@ AlbumThumbnail::AlbumThumbnail( , _fullPreview(file.preview) , _shrinkSize(int(std::ceil(st::historyMessageRadius / 1.4))) , _isVideo(file.type == PreparedFile::Type::Video) -, _buttonsRect(st::sendBoxAlbumGroupRadius, st::callFingerprintBg) { +, _buttonsRect(st::sendBoxAlbumGroupRadius, st::roundedBg) { Expects(!_fullPreview.isNull()); moveToLayout(layout); diff --git a/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp index 7a82a3e06..ca4a3cffe 100644 --- a/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp +++ b/Telegram/SourceFiles/ui/chat/attach/attach_single_media_preview.cpp @@ -69,7 +69,7 @@ SingleMediaPreview::SingleMediaPreview( , _sticker(sticker) , _editMedia(this, st::sendBoxAlbumGroupButtonMedia) , _deleteMedia(this, st::sendBoxAlbumGroupButtonMedia) -, _buttonsRect(st::sendBoxAlbumGroupRadius, st::callFingerprintBg) { +, _buttonsRect(st::sendBoxAlbumGroupRadius, st::roundedBg) { Expects(!preview.isNull()); _deleteMedia->setIconOverride(&st::sendBoxAlbumGroupButtonMediaDelete); diff --git a/Telegram/lib_ui b/Telegram/lib_ui index cedff6dbb..e6b736e71 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit cedff6dbb55a68eb5174d77fa8b29f620f162b0c +Subproject commit e6b736e718abd783e0ca32b471846f0ec38d0750