void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix layout in blocked users list.

Browse source
This commit is contained in:
John Preston 2023-02-09 13:05:21 +04:00
parent 8f908ab9c0
commit 36bf54b0d1
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Telegram/SourceFiles/boxes/boxes.style
View file

@ -572,9 +572,6 @@ changePhoneError: FlatLabel(changePhoneLabel) {
textFg: boxTextFgError; textFg: boxTextFgError;
} }
blockedUsersListSubtitleAddPadding: margins(0px, 1px, 0px, -14px);
blockedUsersListIconPadding: margins(0px, 34px, 0px, 5px);
adminLogFilterUserpicLeft: 15px; adminLogFilterUserpicLeft: 15px;
adminLogFilterLittleSkip: 16px; adminLogFilterLittleSkip: 16px;
adminLogFilterCheckbox: Checkbox(defaultBoxCheckbox) { adminLogFilterCheckbox: Checkbox(defaultBoxCheckbox) {

6
Telegram/SourceFiles/settings/settings.style
View file

@ -513,6 +513,12 @@ settingsPremiumUserAbout: FlatLabel(boxDividerLabel) {
settingsPremiumLock: icon{{ "emoji/premium_lock", windowActiveTextFg, point(0px, 1px) }}; settingsPremiumLock: icon{{ "emoji/premium_lock", windowActiveTextFg, point(0px, 1px) }};
settingsPremiumLockSkip: 3px; 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) { requestPeerRestriction: FlatLabel(defaultFlatLabel) {
minWidth: 240px; minWidth: 240px;
textFg: membersAboutLimitFg; textFg: membersAboutLimitFg;

7
Telegram/SourceFiles/settings/settings_blocked_peers.cpp
View file

@ -98,7 +98,7 @@ QPointer<Ui::RpWidget> Blocked::createPinnedToTop(not_null<QWidget*> parent) {
AddSubsectionTitle( AddSubsectionTitle(
subtitle->entity(), subtitle->entity(),
rpl::duplicate(subtitleText), rpl::duplicate(subtitleText),
st::blockedUsersListSubtitleAddPadding); st::settingsBlockedListSubtitleAddPadding);
subtitle->toggleOn( subtitle->toggleOn(
rpl::merge( rpl::merge(
_emptinessChanges.events() | rpl::map(!rpl::mappers::_1), _emptinessChanges.events() | rpl::map(!rpl::mappers::_1),
@ -134,6 +134,7 @@ void Blocked::setupContent() {
}; };
auto controller = std::make_unique<BlockedBoxController>(_controller); auto controller = std::make_unique<BlockedBoxController>(_controller);
controller->setStyleOverrides(&st::settingsBlockedList);
const auto content = listWrap->entity()->add( const auto content = listWrap->entity()->add(
object_ptr<PeerListContent>(this, controller.get())); object_ptr<PeerListContent>(this, controller.get()));
@ -171,7 +172,7 @@ void Blocked::setupContent() {
st::changePhoneIconSize, st::changePhoneIconSize,
}, },
}, },
st::blockedUsersListIconPadding); st::settingsBlockedListIconPadding);
content->add(std::move(icon.widget)); content->add(std::move(icon.widget));
_showFinished.events( _showFinished.events(
@ -197,7 +198,7 @@ void Blocked::setupContent() {
st::changePhoneDescription)), st::changePhoneDescription)),
st::changePhoneDescriptionPadding); st::changePhoneDescriptionPadding);
AddSkip(content, st::blockedUsersListIconPadding.top()); AddSkip(content, st::settingsBlockedListIconPadding.top());
} }
Ui::ResizeFitChild(this, _container); Ui::ResizeFitChild(this, _container);