From 06d17c6b2c256a3ae3ce729ac35adf5348cf7ab9 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Wed, 30 Mar 2022 19:52:33 +0300 Subject: [PATCH] Changed color of some sensitive menu items to attention one. --- Telegram/SourceFiles/menu/menu_mute.cpp | 2 +- Telegram/SourceFiles/settings/settings_common.cpp | 7 +++++-- .../SourceFiles/settings/settings_information.cpp | 5 +++-- Telegram/SourceFiles/ui/menu_icons.style | 6 +++++- Telegram/SourceFiles/window/window_peer_menu.cpp | 15 +++++++++------ Telegram/lib_ui | 2 +- 6 files changed, 24 insertions(+), 13 deletions(-) diff --git a/Telegram/SourceFiles/menu/menu_mute.cpp b/Telegram/SourceFiles/menu/menu_mute.cpp index f8b306f0c..928a5d1f7 100644 --- a/Telegram/SourceFiles/menu/menu_mute.cpp +++ b/Telegram/SourceFiles/menu/menu_mute.cpp @@ -89,7 +89,7 @@ void MuteItem::paintEvent(QPaintEvent *e) { const auto progress = _animation.value(_isMuted ? 1. : 0.); const auto color = anim::color( - st::settingsIconBg1, + st::menuIconAttentionColor, st::settingsIconBg2, progress); p.setPen(color); diff --git a/Telegram/SourceFiles/settings/settings_common.cpp b/Telegram/SourceFiles/settings/settings_common.cpp index 3f7cf3f3f..8eb34d3b0 100644 --- a/Telegram/SourceFiles/settings/settings_common.cpp +++ b/Telegram/SourceFiles/settings/settings_common.cpp @@ -36,6 +36,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "styles/style_settings.h" #include "styles/style_menu_icons.h" +#include + namespace Settings { namespace { @@ -267,10 +269,11 @@ void FillMenu( [=] { showOther(Information::Id()); }, &st::menuIconInfo); } - addAction( + const auto logout = addAction( tr::lng_settings_logout(tr::now), [=] { window->showLogoutConfirmation(); }, - &st::menuIconLeave); + &st::menuIconLeaveAttention); + logout->setData(st::menuIconAttentionColor->c); } } diff --git a/Telegram/SourceFiles/settings/settings_information.cpp b/Telegram/SourceFiles/settings/settings_information.cpp index 443ae1e78..08b22c60c 100644 --- a/Telegram/SourceFiles/settings/settings_information.cpp +++ b/Telegram/SourceFiles/settings/settings_information.cpp @@ -571,7 +571,7 @@ void SetupAccountsWrap( addAction(tr::lng_menu_activate(tr::now), [=] { Core::App().domain().activate(&session->account()); }, &st::menuIconProfile); - addAction(tr::lng_settings_logout(tr::now), [=] { + const auto logout = addAction(tr::lng_settings_logout(tr::now), [=] { const auto callback = [=](Fn &&close) { close(); Core::App().logoutWithChecks(&session->account()); @@ -584,7 +584,8 @@ void SetupAccountsWrap( .confirmStyle = &st::attentionBoxButton, }), Ui::LayerOption::CloseOther); - }, &st::menuIconLeave); + }, &st::menuIconLeaveAttention); + logout->setData(st::menuIconAttentionColor->c); state->menu->popup(QCursor::pos()); }, raw->lifetime()); diff --git a/Telegram/SourceFiles/ui/menu_icons.style b/Telegram/SourceFiles/ui/menu_icons.style index b3294d0a8..2c1a73c37 100644 --- a/Telegram/SourceFiles/ui/menu_icons.style +++ b/Telegram/SourceFiles/ui/menu_icons.style @@ -24,6 +24,8 @@ dropdownMenuWithIcons: DropdownMenu(defaultDropdownMenu) { } menuIconColor: windowBoldFg; +menuIconAttentionColor: attentionButtonFg; + menuIconReactions: icon {{ "menu/read_reactions", menuIconColor }}; menuIconReply: icon {{ "menu/reply", menuIconColor }}; menuIconViewReplies: icon {{ "menu/view_replies", menuIconColor }}; @@ -67,7 +69,6 @@ menuIconExport: icon {{ "menu/export", menuIconColor }}; menuIconClear: icon {{ "menu/clear", menuIconColor }}; menuIconManage: icon {{ "menu/manage", menuIconColor }}; menuIconDiscussion: icon {{ "menu/discussion", menuIconColor }}; -menuIconLeave: icon {{ "menu/leave", menuIconColor }}; menuIconCreatePoll: icon {{ "menu/create_poll", menuIconColor }}; menuIconQrCode: icon {{ "menu/qr_code", menuIconColor }}; menuIconExpand: icon {{ "menu/expand", menuIconColor }}; @@ -108,3 +109,6 @@ mediaMenuIconShowAll: icon {{ "menu/all_media", mediaviewMenuFg }}; menuIconStartStream: icon {{ "menu/start_stream", menuIconColor }}; menuIconStartStreamWith: icon {{ "menu/start_stream_with", menuIconColor }}; + +menuIconDeleteAttention: icon {{ "menu/delete", menuIconAttentionColor }}; +menuIconLeaveAttention: icon {{ "menu/leave", menuIconAttentionColor }}; diff --git a/Telegram/SourceFiles/window/window_peer_menu.cpp b/Telegram/SourceFiles/window/window_peer_menu.cpp index c327d754b..72c046dab 100644 --- a/Telegram/SourceFiles/window/window_peer_menu.cpp +++ b/Telegram/SourceFiles/window/window_peer_menu.cpp @@ -501,12 +501,13 @@ void Filler::addDeleteChat() { if (_peer->isChannel()) { return; } - _addAction( + const auto action = _addAction( (_peer->isUser() ? tr::lng_profile_delete_conversation(tr::now) : tr::lng_profile_clear_and_exit(tr::now)), DeleteAndLeaveHandler(_controller, _peer), - &st::menuIconDelete); + &st::menuIconDeleteAttention); + action->setData(st::menuIconAttentionColor->c); } void Filler::addLeaveChat() { @@ -514,12 +515,13 @@ void Filler::addLeaveChat() { if (!channel || !channel->amIn()) { return; } - _addAction( + const auto leave = _addAction( (_peer->isMegagroup() ? tr::lng_profile_leave_group(tr::now) : tr::lng_profile_leave_channel(tr::now)), DeleteAndLeaveHandler(_controller, _peer), - &st::menuIconLeave); + &st::menuIconLeaveAttention); + leave->setData(st::menuIconAttentionColor->c); } void Filler::addBlockUser() { @@ -695,10 +697,11 @@ void Filler::addDeleteContact() { return; } const auto controller = _controller; - _addAction( + const auto action = _addAction( tr::lng_info_delete_contact(tr::now), [=] { PeerMenuDeleteContact(controller, user); }, - &st::menuIconDelete); + &st::menuIconDeleteAttention); + action->setData(st::menuIconAttentionColor->c); } void Filler::addManageChat() { diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 9f28a0b10..8d181e53c 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 9f28a0b106311566d2adab8a7b82973accfdd944 +Subproject commit 8d181e53c573639d8a4a7e66e89bc01791b0572b