diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style index ae6faa563..54f915a45 100644 --- a/Telegram/SourceFiles/boxes/boxes.style +++ b/Telegram/SourceFiles/boxes/boxes.style @@ -572,9 +572,6 @@ changePhoneError: FlatLabel(changePhoneLabel) { textFg: boxTextFgError; } -blockedUsersListSubtitleAddPadding: margins(0px, 1px, 0px, -14px); -blockedUsersListIconPadding: margins(0px, 34px, 0px, 5px); - adminLogFilterUserpicLeft: 15px; adminLogFilterLittleSkip: 16px; adminLogFilterCheckbox: Checkbox(defaultBoxCheckbox) { diff --git a/Telegram/SourceFiles/settings/settings.style b/Telegram/SourceFiles/settings/settings.style index ca2113b68..76b5b9dc6 100644 --- a/Telegram/SourceFiles/settings/settings.style +++ b/Telegram/SourceFiles/settings/settings.style @@ -513,6 +513,12 @@ settingsPremiumUserAbout: FlatLabel(boxDividerLabel) { settingsPremiumLock: icon{{ "emoji/premium_lock", windowActiveTextFg, point(0px, 1px) }}; settingsPremiumLockSkip: 3px; +settingsBlockedListSubtitleAddPadding: margins(0px, 1px, 0px, -4px); +settingsBlockedListIconPadding: margins(0px, 34px, 0px, 5px); +settingsBlockedList: PeerList(peerListBox) { + padding: margins(0px, 0px, 0px, membersMarginBottom); +} + requestPeerRestriction: FlatLabel(defaultFlatLabel) { minWidth: 240px; textFg: membersAboutLimitFg; diff --git a/Telegram/SourceFiles/settings/settings_blocked_peers.cpp b/Telegram/SourceFiles/settings/settings_blocked_peers.cpp index 620433d73..c9dce22cd 100644 --- a/Telegram/SourceFiles/settings/settings_blocked_peers.cpp +++ b/Telegram/SourceFiles/settings/settings_blocked_peers.cpp @@ -98,7 +98,7 @@ QPointer Blocked::createPinnedToTop(not_null parent) { AddSubsectionTitle( subtitle->entity(), rpl::duplicate(subtitleText), - st::blockedUsersListSubtitleAddPadding); + st::settingsBlockedListSubtitleAddPadding); subtitle->toggleOn( rpl::merge( _emptinessChanges.events() | rpl::map(!rpl::mappers::_1), @@ -134,6 +134,7 @@ void Blocked::setupContent() { }; auto controller = std::make_unique(_controller); + controller->setStyleOverrides(&st::settingsBlockedList); const auto content = listWrap->entity()->add( object_ptr(this, controller.get())); @@ -171,7 +172,7 @@ void Blocked::setupContent() { st::changePhoneIconSize, }, }, - st::blockedUsersListIconPadding); + st::settingsBlockedListIconPadding); content->add(std::move(icon.widget)); _showFinished.events( @@ -197,7 +198,7 @@ void Blocked::setupContent() { st::changePhoneDescription)), st::changePhoneDescriptionPadding); - AddSkip(content, st::blockedUsersListIconPadding.top()); + AddSkip(content, st::settingsBlockedListIconPadding.top()); } Ui::ResizeFitChild(this, _container);