From 94d943f3afd0150518eb8c5e366b07bcc3f52c8c Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Tue, 10 May 2022 06:59:26 +0300 Subject: [PATCH] Fixed style of icons in info peer box. --- .../boxes/peers/edit_peer_info_box.cpp | 12 ++++++------ .../boxes/peers/edit_peer_type_box.cpp | 2 +- Telegram/SourceFiles/info/info.style | 15 +++++++++------ .../info/profile/info_profile_actions.cpp | 4 ++-- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp index 485f84093..d9bc84af7 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_peer_info_box.cpp @@ -804,7 +804,7 @@ void Controller::fillSignaturesButton() { tr::lng_edit_sign_messages(), rpl::single(QString()), [] {}, - { &st::infoIconSignature, Settings::kIconLightBlue } + { &st::infoRoundedIconSignature, Settings::kIconLightBlue } )->toggleOn(rpl::single(channel->addsSignature()) )->toggledValue( ) | rpl::start_with_next([=](bool toggled) { @@ -1009,7 +1009,7 @@ void Controller::fillManageSection() { *Data::PeerAllowedReactions(_peer), done)); }, - { &st::infoIconReactions, Settings::kIconRed }); + { &st::infoRoundedIconReactions, Settings::kIconRed }); } if (canEditPermissions) { AddButtonWithCount( @@ -1058,7 +1058,7 @@ void Controller::fillManageSection() { 0), Ui::LayerOption::KeepOther); }, - { &st::infoIconInviteLinks, Settings::kIconLightOrange }); + { &st::infoRoundedIconInviteLinks, Settings::kIconLightOrange }); if (_privacySavedValue) { _privacyTypeUpdates.events_starting_with_copy( @@ -1086,7 +1086,7 @@ void Controller::fillManageSection() { _peer, ParticipantsBoxController::Role::Admins); }, - { &st::infoIconAdministrators, Settings::kIconLightBlue }); + { &st::infoRoundedIconAdministrators, Settings::kIconLightBlue }); } if (canViewMembers) { AddButtonWithCount( @@ -1135,7 +1135,7 @@ void Controller::fillManageSection() { tr::lng_manage_peer_recent_actions(), rpl::single(QString()), //Empty count. std::move(callback), - { &st::infoIconRecentActions, Settings::kIconPurple }); + { &st::infoRoundedIconRecentActions, Settings::kIconPurple }); } if (canEditStickers || canDeleteChannel) { @@ -1177,7 +1177,7 @@ void Controller::fillPendingRequestsButton() { : tr::lng_manage_peer_requests_channel()), rpl::duplicate(pendingRequestsCount) | ToPositiveNumberString(), [=] { RequestsBoxController::Start(_navigation, _peer); }, - { &st::infoIconRequests, Settings::kIconRed }); + { &st::infoRoundedIconRequests, Settings::kIconRed }); std::move( pendingRequestsCount ) | rpl::start_with_next([=](int count) { diff --git a/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp b/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp index edcfa5cd3..e6d6ad2e7 100644 --- a/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp +++ b/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp @@ -199,7 +199,7 @@ void Controller::createContent() { Ui::LayerOption::KeepOther); }, st::manageGroupButton, - { &st::infoIconInviteLinks, Settings::kIconLightOrange })); + { &st::infoRoundedIconInviteLinks, Settings::kIconLightOrange })); AddSkip(_wrap.get()); AddDividerText(_wrap.get(), tr::lng_group_invite_manage_about()); diff --git a/Telegram/SourceFiles/info/info.style b/Telegram/SourceFiles/info/info.style index 9bef5ec36..30aaceb97 100644 --- a/Telegram/SourceFiles/info/info.style +++ b/Telegram/SourceFiles/info/info.style @@ -316,7 +316,7 @@ infoProfileSeparatorPadding: margins( infoIconFg: windowBoldFg; infoIconInformation: icon {{ "info/info_information", infoIconFg }}; -infoIconRequests: icon {{ "info/edit/group_manage_join_requests", infoIconFg }}; +infoIconAddMember: icon {{ "info/info_add_member", infoIconFg }}; infoIconNotifications: icon {{ "info/info_notifications", infoIconFg }}; infoIconMediaPhoto: icon {{ "info/info_media_photo", infoIconFg }}; infoIconMediaVideo: icon {{ "info/info_media_video", infoIconFg }}; @@ -327,11 +327,14 @@ infoIconMediaLink: icon {{ "info/info_media_link", infoIconFg }}; infoIconMediaGroup: icon {{ "info/info_common_groups", infoIconFg }}; infoIconMediaVoice: icon {{ "info/info_media_voice", infoIconFg }}; infoIconMediaRound: icon {{ "info/info_media_round", infoIconFg }}; -infoIconRecentActions: icon {{ "info/edit/group_manage_actions", settingsIconFg }}; -infoIconAdministrators: icon {{ "info/edit/group_manage_admins", settingsIconFg }}; -infoIconInviteLinks: icon {{ "info/edit/group_manage_links", settingsIconFg }}; -infoIconReactions: icon {{ "info/edit/group_manage_reactions", settingsIconFg }}; -infoIconSignature: icon {{ "info/edit/channel_manage_signature", settingsIconFg }}; + +infoRoundedIconRequests: icon {{ "info/edit/group_manage_join_requests", settingsIconFg }}; +infoRoundedIconRecentActions: icon {{ "info/edit/group_manage_actions", settingsIconFg }}; +infoRoundedIconAdministrators: icon {{ "info/edit/group_manage_admins", settingsIconFg }}; +infoRoundedIconInviteLinks: icon {{ "info/edit/group_manage_links", settingsIconFg }}; +infoRoundedIconReactions: icon {{ "info/edit/group_manage_reactions", settingsIconFg }}; +infoRoundedIconSignature: icon {{ "info/edit/channel_manage_signature", settingsIconFg }}; + infoIconShare: icon {{ "info/info_share", infoIconFg }}; infoIconEdit: icon {{ "info/info_edit", infoIconFg }}; infoIconDelete: icon {{ "info/info_delete", infoIconFg }}; diff --git a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp index f302ff025..d7620d30a 100644 --- a/Telegram/SourceFiles/info/profile/info_profile_actions.cpp +++ b/Telegram/SourceFiles/info/profile/info_profile_actions.cpp @@ -529,7 +529,7 @@ void ActionsFiller::addInviteToGroupAction( InviteToChatButton(user) | rpl::filter(notEmpty), InviteToChatButton(user) | rpl::map(notEmpty), [=] { AddBotToGroupBoxController::Start(user); }, - &st::infoIconRequests); + &st::infoIconAddMember); const auto about = _wrap->add( object_ptr>( _wrap.data(), @@ -719,7 +719,7 @@ void ActionsFiller::addJoinChannelAction( tr::lng_profile_join_channel(), rpl::duplicate(joinVisible), [=] { channel->session().api().joinChannel(channel); }, - &st::infoIconRequests); + &st::infoIconAddMember); _wrap->add(object_ptr>( _wrap, CreateSkipWidget(