From b04aaba8d09661a9b801787235399f466a423805 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Tue, 3 May 2022 20:57:23 +0300 Subject: [PATCH] Slightly improved style of box for edit folder. --- Telegram/Resources/icons/settings/remove.png | Bin 0 -> 193 bytes .../Resources/icons/settings/remove@2x.png | Bin 0 -> 233 bytes .../Resources/icons/settings/remove@3x.png | Bin 0 -> 294 bytes .../boxes/filters/edit_filter_box.cpp | 24 +++++------------- Telegram/SourceFiles/settings/settings.style | 8 +++--- .../SourceFiles/settings/settings_folders.cpp | 2 +- Telegram/SourceFiles/window/window.style | 5 ++-- 7 files changed, 15 insertions(+), 24 deletions(-) create mode 100644 Telegram/Resources/icons/settings/remove.png create mode 100644 Telegram/Resources/icons/settings/remove@2x.png create mode 100644 Telegram/Resources/icons/settings/remove@3x.png diff --git a/Telegram/Resources/icons/settings/remove.png b/Telegram/Resources/icons/settings/remove.png new file mode 100644 index 0000000000000000000000000000000000000000..087a4c3748164169d6e9e4cc84176f6c196468fb GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1SFYWcSQjy#^NA%Cx&(BWL^R}E~ycoX}-P; zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyy~SS-^~7gA{JM`{6H;()M(546zVQ zPLN<-tmu%$k#l#~S9?B&DNe>coW1?++$O^PZ&qB%;7H(QWDu*7SBt%*mju%8>FVdQ I&MBb@0NWZR@&Et; literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings/remove@2x.png b/Telegram/Resources/icons/settings/remove@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..81b4161b40a4bb7985ba21da82d21d05c108cf3b GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU1SFZ~=vx6P#^NA%Cx&(BWL^R}E~ycoX}-P; zT0k}j17mw80}DtA5K93uP|pHJ24*152ohVs1eeuVz>Hvn6jnV;TLYwmJzX3_A~@e( zaO65*z`=6h!u_BB)qhL~J7GKFOM>R(&}mmC4+|(bG%zqSvDm2z2+pj`_jA?y@oH-G xwaOIM>qoCw-QAYEIPZ6aAy5H_fWn9LMs}4gE6(rv<`@pL#?#f$Wt~$(6999IJH!A0 literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/settings/remove@3x.png b/Telegram/Resources/icons/settings/remove@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..4fbf2e331b01f29a67f634b24d8f8a6d8a631c17 GIT binary patch literal 294 zcmeAS@N?(olHy`uVBq!ia0vp^HXzKw1SGf4^HT*eCuA4(zn?458rkkyM9g3TIRNV-rsinH}j{i+q$me%Ay;a oU+LE$5j|tXiDDMm^cuYa2L2x*Ybra0K^|xDboFyt=akR{00p2=#sB~S literal 0 HcmV?d00001 diff --git a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp index 44c1ef8ca..127cb07bb 100644 --- a/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp +++ b/Telegram/SourceFiles/boxes/filters/edit_filter_box.cpp @@ -500,6 +500,7 @@ void EditFilterBox( const Data::ChatFilter &filter, Fn doneCallback) { const auto creating = filter.title().isEmpty(); + box->setWidth(st::boxWideWidth); box->setTitle(creating ? tr::lng_filters_new() : tr::lng_filters_edit()); box->setCloseByOutsideClick(false); @@ -572,8 +573,8 @@ void EditFilterBox( const auto includeAdd = AddButton( content, tr::lng_filters_add_chats(), - st::settingsFolderButton, - { &st::settingsIconPlus, kIconGreen }); + st::settingsButtonActive, + { &st::settingsIconAdd, 0, IconType::Round, &st::windowBgActive }); const auto include = SetupChatsPreview( content, @@ -583,13 +584,7 @@ void EditFilterBox( &Data::ChatFilter::always); AddSkip(content); - content->add( - object_ptr( - content, - tr::lng_filters_include_about(), - st::boxDividerLabel), - st::windowFilterAboutPadding); - AddDivider(content); + AddDividerText(content, tr::lng_filters_include_about()); AddSkip(content); AddSubsectionTitle(content, tr::lng_filters_exclude()); @@ -597,8 +592,8 @@ void EditFilterBox( const auto excludeAdd = AddButton( content, tr::lng_filters_remove_chats(), - st::settingsFolderButton, - { &st::settingsIconMinus, kIconRed }); + st::settingsButtonActive, + { &st::settingsIconRemove, 0, IconType::Round, &st::windowBgActive }); const auto exclude = SetupChatsPreview( content, @@ -608,12 +603,7 @@ void EditFilterBox( &Data::ChatFilter::never); AddSkip(content); - content->add( - object_ptr( - content, - tr::lng_filters_exclude_about(), - st::boxDividerLabel), - st::windowFilterAboutPadding); + AddDividerText(content, tr::lng_filters_exclude_about()); const auto refreshPreviews = [=] { include->updateData( diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style index a531394cf..2242ce4cb 100644 --- a/Telegram/SourceFiles/settings/settings.style +++ b/Telegram/SourceFiles/settings/settings.style @@ -18,6 +18,8 @@ settingsButton: SettingsButton(infoProfileButton) { settingsButtonNoIcon: SettingsButton(settingsButton) { padding: margins(22px, 10px, 22px, 8px); } +settingsButtonActive: SettingsButton(infoMainButton, settingsButton) { +} settingsAttentionButton: SettingsButton(settingsButtonNoIcon) { textFg: attentionButtonFg; textFgOver: attentionButtonFgOver; @@ -51,9 +53,6 @@ settingsUpdate: SettingsButton(infoMainButton, settingsButtonNoIcon) { settingsUpdateStatePosition: point(22px, 29px); settingsDividerLabelPadding: margins(22px, 8px, 22px, 16px); -settingsFolderButton: SettingsButton(infoMainButton, settingsButton) { -} - settingsIconAccount: icon {{ "settings/account", settingsIconFg }}; settingsIconNotifications: icon {{ "settings/notifications", settingsIconFg }}; settingsIconChat: icon {{ "settings/chat", settingsIconFg }}; @@ -95,6 +94,9 @@ settingsIconDownload: icon {{ "settings/download", settingsIconFg }}; settingsIconMention: icon {{ "settings/mention", settingsIconFg }}; settingsIconBlocked: icon {{ "settings/blocked", settingsIconFg }}; +settingsIconAdd: icon {{ "settings/add", windowFgActive }}; +settingsIconRemove: icon {{ "settings/remove", windowFgActive }}; + settingsCheckbox: Checkbox(defaultBoxCheckbox) { textPosition: point(15px, 1px); } diff --git a/Telegram/SourceFiles/settings/settings_folders.cpp b/Telegram/SourceFiles/settings/settings_folders.cpp index f0bd97f1c..86e3b3685 100644 --- a/Telegram/SourceFiles/settings/settings_folders.cpp +++ b/Telegram/SourceFiles/settings/settings_folders.cpp @@ -412,7 +412,7 @@ void FilterRowButton::paintEvent(QPaintEvent *e) { AddButton( container, tr::lng_filters_create(), - st::settingsFolderButton, + st::settingsButtonActive, { &st::settingsIconFolders, kIconLightBlue } )->setClickedCallback([=] { if (showLimitReached()) { diff --git a/Telegram/SourceFiles/window/window.style b/Telegram/SourceFiles/window/window.style index 479dc6bc8..4276da4de 100644 --- a/Telegram/SourceFiles/window/window.style +++ b/Telegram/SourceFiles/window/window.style @@ -286,8 +286,8 @@ windowFiltersMainMenuUnreadMuted: icon { }; windowFilterSmallItem: PeerListItem(defaultPeerListItem) { height: 44px; - photoPosition: point(15px, 5px); - namePosition: point(62px, 14px); + photoPosition: point(13px, 5px); + namePosition: point(59px, 14px); photoSize: 34px; checkbox: RoundImageCheckbox(defaultPeerListCheckbox) { imageRadius: 17px; @@ -324,7 +324,6 @@ windowFilterChatsSectionSubtitle: FlatLabel(defaultFlatLabel) { textFg: searchedBarFg; } windowFilterChatsSectionSubtitlePadding: margins(17px, 7px, 17px, 7px); -windowFilterAboutPadding: margins(22px, 0px, 22px, 19px); windowArchiveToast: Toast(defaultToast) { minWidth: boxWideWidth;