mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2025-04-16 06:07:06 +02:00
Use simplified TextStyle.
This commit is contained in:
parent
cba8387589
commit
dd692f2d26
23 changed files with 29 additions and 149 deletions
|
@ -85,8 +85,6 @@ confirmInviteTitle: FlatLabel(defaultFlatLabel) {
|
|||
textFg: windowBoldFg;
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
font: font(18px semibold);
|
||||
linkFont: font(18px semibold);
|
||||
linkFontOver: font(18px semibold underline);
|
||||
}
|
||||
}
|
||||
confirmInviteAbout: FlatLabel(boxLabel) {
|
||||
|
@ -143,8 +141,6 @@ contactsPadding: margins(16px, 7px, 16px, 7px);
|
|||
contactsNameTop: 2px;
|
||||
contactsNameStyle: TextStyle(defaultTextStyle) {
|
||||
font: semiboldFont;
|
||||
linkFont: semiboldFont;
|
||||
linkFontOver: semiboldFont;
|
||||
}
|
||||
contactsStatusTop: 23px;
|
||||
contactsStatusFont: font(fsize);
|
||||
|
@ -199,8 +195,6 @@ localStorageRowTitle: FlatLabel(defaultFlatLabel) {
|
|||
maxHeight: 20px;
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
font: font(14px semibold);
|
||||
linkFont: font(14px semibold);
|
||||
linkFontOver: font(14px semibold);
|
||||
}
|
||||
}
|
||||
localStorageRowSize: FlatLabel(defaultFlatLabel) {
|
||||
|
@ -208,8 +202,6 @@ localStorageRowSize: FlatLabel(defaultFlatLabel) {
|
|||
maxHeight: 20px;
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
font: font(14px);
|
||||
linkFont: font(14px);
|
||||
linkFontOver: font(14px);
|
||||
}
|
||||
}
|
||||
localStorageClear: defaultBoxButton;
|
||||
|
@ -228,8 +220,6 @@ sharePhotoTop: 6px;
|
|||
shareBoxListItem: PeerListItem(defaultPeerListItem) {
|
||||
nameStyle: TextStyle(defaultTextStyle) {
|
||||
font: font(11px);
|
||||
linkFont: font(11px);
|
||||
linkFontOver: font(11px);
|
||||
}
|
||||
nameFg: windowFg;
|
||||
nameFgChecked: windowActiveTextFg;
|
||||
|
@ -537,8 +527,6 @@ adminLogFilterLittleSkip: 16px;
|
|||
adminLogFilterCheckbox: Checkbox(defaultBoxCheckbox) {
|
||||
style: TextStyle(boxTextStyle) {
|
||||
font: font(boxFontSize semibold);
|
||||
linkFont: font(boxFontSize semibold);
|
||||
linkFontOver: font(boxFontSize semibold underline);
|
||||
}
|
||||
}
|
||||
adminLogFilterSkip: 32px;
|
||||
|
@ -580,16 +568,12 @@ rightsPhotoButton: UserpicButton(defaultUserpicButton) {
|
|||
rightsPhotoMargin: margins(20px, 0px, 15px, 18px);
|
||||
rightsNameStyle: TextStyle(semiboldTextStyle) {
|
||||
font: font(15px semibold);
|
||||
linkFont: font(15px semibold);
|
||||
linkFontOver: font(15px semibold underline);
|
||||
}
|
||||
rightsNameTop: 8px;
|
||||
rightsStatusTop: 32px;
|
||||
rightsHeaderLabel: FlatLabel(boxLabel) {
|
||||
style: TextStyle(semiboldTextStyle) {
|
||||
font: font(boxFontSize semibold);
|
||||
linkFont: font(boxFontSize semibold);
|
||||
linkFontOver: font(boxFontSize semibold underline);
|
||||
}
|
||||
textFg: windowActiveTextFg;
|
||||
}
|
||||
|
@ -623,8 +607,6 @@ proxyRowTitlePalette: TextPalette(defaultTextPalette) {
|
|||
}
|
||||
proxyRowTitleStyle: TextStyle(defaultTextStyle) {
|
||||
font: semiboldFont;
|
||||
linkFont: normalFont;
|
||||
linkFontOver: normalFont;
|
||||
}
|
||||
proxyRowStatusFg: windowSubTextFg;
|
||||
proxyRowStatusFgOnline: windowActiveTextFg;
|
||||
|
@ -807,8 +789,6 @@ pollResultsQuestion: FlatLabel(defaultFlatLabel) {
|
|||
textFg: windowBoldFg;
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
font: font(16px semibold);
|
||||
linkFont: font(16px semibold);
|
||||
linkFontOver: font(16px semibold underline);
|
||||
}
|
||||
}
|
||||
pollResultsVotesCount: FlatLabel(defaultFlatLabel) {
|
||||
|
@ -837,8 +817,6 @@ inviteViaLinkButton: SettingsButton(defaultSettingsButton) {
|
|||
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
font: font(14px semibold);
|
||||
linkFont: font(14px semibold);
|
||||
linkFontOver: font(14px semibold underline);
|
||||
}
|
||||
|
||||
height: 20px;
|
||||
|
|
|
@ -170,7 +170,7 @@ void PeerListRowWithLink::rightActionPaint(
|
|||
int outerWidth,
|
||||
bool selected,
|
||||
bool actionSelected) {
|
||||
p.setFont(actionSelected ? st::linkOverFont : st::linkFont);
|
||||
p.setFont(actionSelected ? st::linkFontOver : st::linkFont);
|
||||
p.setPen(actionSelected ? st::defaultLinkButton.overColor : st::defaultLinkButton.color);
|
||||
p.drawTextLeft(x, y, outerWidth, _action, _actionWidth);
|
||||
}
|
||||
|
|
|
@ -97,8 +97,6 @@ callButtonLabel: FlatLabel(defaultFlatLabel) {
|
|||
textFg: callNameFg;
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
font: font(11px);
|
||||
linkFont: font(11px);
|
||||
linkFontOver: font(11px underline);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -218,8 +216,6 @@ callMuteButtonLabel: FlatLabel(defaultFlatLabel) {
|
|||
textFg: groupCallMembersFg;
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
font: font(14px);
|
||||
linkFont: font(14px);
|
||||
linkFontOver: font(14px underline);
|
||||
}
|
||||
}
|
||||
callMuteButtonActiveInner: IconButton {
|
||||
|
@ -294,8 +290,6 @@ callName: FlatLabel(defaultFlatLabel) {
|
|||
align: align(top);
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
font: font(21px semibold);
|
||||
linkFont: font(21px semibold);
|
||||
linkFontOver: font(21px semibold underline);
|
||||
}
|
||||
}
|
||||
callStatus: FlatLabel(defaultFlatLabel) {
|
||||
|
@ -305,8 +299,6 @@ callStatus: FlatLabel(defaultFlatLabel) {
|
|||
align: align(top);
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
font: font(14px);
|
||||
linkFont: font(14px);
|
||||
linkFontOver: font(14px underline);
|
||||
}
|
||||
}
|
||||
callRemoteAudioMute: FlatLabel(callStatus) {
|
||||
|
@ -314,8 +306,6 @@ callRemoteAudioMute: FlatLabel(callStatus) {
|
|||
textFg: videoPlayIconFg;
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
font: font(12px);
|
||||
linkFont: font(12px);
|
||||
linkFontOver: font(12px underline);
|
||||
}
|
||||
}
|
||||
callRemoteAudioMuteSkip: 12px;
|
||||
|
@ -746,8 +736,6 @@ groupCallShareBoxList: PeerList(groupCallMembersList) {
|
|||
item: PeerListItem(groupCallMembersListItem) {
|
||||
nameStyle: TextStyle(defaultTextStyle) {
|
||||
font: font(11px);
|
||||
linkFont: font(11px);
|
||||
linkFontOver: font(11px);
|
||||
}
|
||||
checkbox: RoundImageCheckbox(groupCallMembersListCheckbox) {
|
||||
imageRadius: 28px;
|
||||
|
@ -784,8 +772,6 @@ groupCallTitleLabel: FlatLabel(groupCallSubtitleLabel) {
|
|||
textFg: groupCallMembersFg;
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
font: font(semibold 14px);
|
||||
linkFont: font(semibold 14px);
|
||||
linkFontOver: font(semibold 14px);
|
||||
}
|
||||
}
|
||||
groupCallTitleSeparator: 4px;
|
||||
|
@ -1203,8 +1189,6 @@ callTopBarMuteCrossLine: CrossLineAnimation {
|
|||
groupCallStartsIn: FlatLabel(defaultFlatLabel) {
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
font: font(20px semibold);
|
||||
linkFont: font(20px semibold);
|
||||
linkFontOver: font(20px semibold underline);
|
||||
}
|
||||
textFg: groupCallMembersFg;
|
||||
}
|
||||
|
|
|
@ -509,8 +509,6 @@ emojiPanColorAllLabel: FlatLabel(defaultFlatLabel) {
|
|||
minWidth: 40px;
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
font: font(12px);
|
||||
linkFont: font(12px);
|
||||
linkFontOver: font(12px);
|
||||
}
|
||||
}
|
||||
emojiPanColorAllPadding: margins(10px, 6px, 10px, -1px);
|
||||
|
|
|
@ -65,12 +65,8 @@ dialogsRipple: RippleAnimation(defaultRippleAnimation) {
|
|||
color: dialogsRippleBg;
|
||||
}
|
||||
|
||||
dialogsTextFont: font(fsize);
|
||||
dialogsTextStyle: TextStyle(defaultTextStyle) {
|
||||
font: dialogsTextFont;
|
||||
linkFont: dialogsTextFont;
|
||||
linkFontOver: dialogsTextFont;
|
||||
}
|
||||
dialogsTextFont: normalFont;
|
||||
dialogsTextStyle: defaultTextStyle;
|
||||
dialogsDateFont: font(13px);
|
||||
dialogsDateSkip: 5px;
|
||||
|
||||
|
@ -447,11 +443,7 @@ dialogsSearchInHeight: 52px;
|
|||
dialogsSearchInPhotoSize: 36px;
|
||||
dialogsSearchInPhotoPadding: 10px;
|
||||
dialogsSearchInSkip: 7px;
|
||||
dialogsSearchFromStyle: TextStyle(defaultTextStyle) {
|
||||
font: normalFont;
|
||||
linkFont: semiboldFont;
|
||||
linkFontOver: semiboldFont;
|
||||
}
|
||||
dialogsSearchFromStyle: defaultTextStyle;
|
||||
dialogsSearchFromPalette: TextPalette(defaultTextPalette) {
|
||||
linkFg: dialogsNameFg;
|
||||
}
|
||||
|
@ -507,8 +499,6 @@ downloadTitleLeft: 57px;
|
|||
downloadTitleTop: 4px;
|
||||
downloadInfoStyle: TextStyle(defaultTextStyle) {
|
||||
font: font(12px);
|
||||
linkFont: font(12px);
|
||||
linkFontOver: font(12px underline);
|
||||
}
|
||||
downloadInfoLeft: 57px;
|
||||
downloadInfoTop: 23px;
|
||||
|
@ -541,8 +531,6 @@ chooseTopicListItem: PeerListItem(defaultPeerListItem) {
|
|||
namePosition: point(55px, 11px);
|
||||
nameStyle: TextStyle(defaultTextStyle) {
|
||||
font: font(14px semibold);
|
||||
linkFont: font(14px semibold);
|
||||
linkFontOver: font(14px semibold);
|
||||
}
|
||||
}
|
||||
chooseTopicList: PeerList(defaultPeerList) {
|
||||
|
@ -599,8 +587,6 @@ dialogsStoriesFull: DialogsStories {
|
|||
nameTop: 56px;
|
||||
nameStyle: TextStyle(defaultTextStyle) {
|
||||
font: font(11px);
|
||||
linkFont: font(11px);
|
||||
linkFontOver: font(11px);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -2913,7 +2913,7 @@ void InnerWidget::refreshSearchInChatLabel() {
|
|||
const auto fromUserText = tr::lng_dlg_search_from(
|
||||
tr::now,
|
||||
lt_user,
|
||||
Ui::Text::Link(from),
|
||||
Ui::Text::Semibold(from),
|
||||
Ui::Text::WithEntities);
|
||||
_searchFromUserText.setMarkedText(
|
||||
st::dialogsSearchFromStyle,
|
||||
|
|
|
@ -38,8 +38,6 @@ photoEditorTextButtonPadding: margins(22px, 0px, 22px, 0px);
|
|||
|
||||
photoEditorButtonStyle: TextStyle(semiboldTextStyle) {
|
||||
font: font(14px semibold);
|
||||
linkFont: font(14px semibold);
|
||||
linkFontOver: font(14px semibold underline);
|
||||
}
|
||||
photoEditorButtonTextTop: 15px;
|
||||
|
||||
|
|
|
@ -16,8 +16,6 @@ exportSubSettingPadding: margins(56px, 4px, 22px, 12px);
|
|||
exportHeaderLabel: FlatLabel(boxTitle) {
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
font: font(15px semibold);
|
||||
linkFont: font(15px semibold);
|
||||
linkFontOver: font(15px semibold underline);
|
||||
}
|
||||
}
|
||||
exportHeaderPadding: margins(22px, 20px, 22px, 9px);
|
||||
|
@ -57,8 +55,6 @@ exportProgressLabel: FlatLabel(boxLabel) {
|
|||
maxHeight: 20px;
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
font: font(14px semibold);
|
||||
linkFont: font(14px semibold);
|
||||
linkFontOver: font(14px semibold);
|
||||
}
|
||||
}
|
||||
exportProgressInfoLabel: FlatLabel(boxLabel) {
|
||||
|
|
|
@ -131,8 +131,6 @@ infoTopBarTitle: FlatLabel(defaultFlatLabel) {
|
|||
maxHeight: 20px;
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
font: font(14px semibold);
|
||||
linkFont: font(14px semibold);
|
||||
linkFontOver: font(14px semibold);
|
||||
}
|
||||
}
|
||||
infoTopBarMediaCancel: IconButton(infoTopBarBack) {
|
||||
|
@ -301,11 +299,6 @@ infoProfilePhotoSize: size(
|
|||
infoProfileStatus: FlatLabel(defaultFlatLabel) {
|
||||
maxHeight: 18px;
|
||||
textFg: windowSubTextFg;
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
font: normalFont;
|
||||
linkFont: normalFont;
|
||||
linkFontOver: normalFont;
|
||||
}
|
||||
}
|
||||
infoProfileCover: InfoProfileCover {
|
||||
height: 108px;
|
||||
|
@ -320,8 +313,6 @@ infoProfileCover: InfoProfileCover {
|
|||
textFg: windowBoldFg;
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
font: font(16px semibold);
|
||||
linkFont: font(16px semibold);
|
||||
linkFontOver: font(16px semibold underline);
|
||||
}
|
||||
}
|
||||
nameLeft: 109px;
|
||||
|
@ -333,7 +324,6 @@ infoProfileCover: InfoProfileCover {
|
|||
}
|
||||
infoProfileMegagroupCover: InfoProfileCover(infoProfileCover) {
|
||||
status: FlatLabel(infoProfileStatus) {
|
||||
style: defaultTextStyle;
|
||||
palette: TextPalette(defaultTextPalette) {
|
||||
linkFg: windowSubTextFg;
|
||||
}
|
||||
|
@ -427,8 +417,6 @@ infoBlockHeaderLabel: FlatLabel(infoProfileStatus) {
|
|||
textFg: windowBoldFg;
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
font: semiboldFont;
|
||||
linkFont: semiboldFont;
|
||||
linkFontOver: semiboldFont;
|
||||
}
|
||||
}
|
||||
infoBlockHeaderPosition: point(79px, 17px);
|
||||
|
@ -550,8 +538,6 @@ infoCommonGroupsListItem: PeerListItem(defaultPeerListItem) {
|
|||
namePosition: point(71px, 15px);
|
||||
nameStyle: TextStyle(defaultTextStyle) {
|
||||
font: font(14px semibold);
|
||||
linkFont: font(14px semibold);
|
||||
linkFontOver: font(14px semibold);
|
||||
}
|
||||
statusPosition: point(79px, 31px);
|
||||
}
|
||||
|
@ -924,8 +910,6 @@ shortInfoCover: ShortInfoCover {
|
|||
maxHeight: 19px;
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
font: font(15px semibold);
|
||||
linkFont: font(15px semibold);
|
||||
linkFontOver: font(15px semibold underline);
|
||||
}
|
||||
}
|
||||
namePosition: point(25px, 37px);
|
||||
|
|
|
@ -152,11 +152,16 @@ std::shared_ptr<ContentMemento> Memento::DefaultContent(
|
|||
std::shared_ptr<ContentMemento> Memento::DefaultContent(
|
||||
not_null<Data::ForumTopic*> topic,
|
||||
Section section) {
|
||||
const auto peer = topic->peer();
|
||||
const auto migrated = peer->migrateFrom();
|
||||
const auto migratedPeerId = migrated ? migrated->id : PeerId(0);
|
||||
switch (section.type()) {
|
||||
case Section::Type::Profile:
|
||||
return std::make_shared<Profile::Memento>(topic);
|
||||
case Section::Type::Media:
|
||||
return std::make_shared<Media::Memento>(topic, section.mediaType());
|
||||
case Section::Type::Members:
|
||||
return std::make_shared<Members::Memento>(peer, migratedPeerId);
|
||||
}
|
||||
Unexpected("Wrong section type in Info::Memento::DefaultContent()");
|
||||
}
|
||||
|
|
|
@ -543,7 +543,7 @@ void Cover::refreshStatusText() {
|
|||
onlineCount,
|
||||
channel->isMegagroup());
|
||||
return hasMembersLink
|
||||
? Ui::Text::Colorized(result)
|
||||
? Ui::Text::Link(result)
|
||||
: TextWithEntities{ .text = result };
|
||||
}
|
||||
return tr::lng_chat_status_unaccessible(tr::now, WithEntities);
|
||||
|
|
|
@ -33,8 +33,6 @@ introCoverTitle: FlatLabel(defaultFlatLabel) {
|
|||
align: align(center);
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
font: font(22px semibold);
|
||||
linkFont: font(22px semibold);
|
||||
linkFontOver: font(22px semibold underline);
|
||||
}
|
||||
}
|
||||
introCoverTitleTop: 136px;
|
||||
|
@ -43,8 +41,6 @@ introCoverDescription: FlatLabel(defaultFlatLabel) {
|
|||
align: align(center);
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
font: font(15px);
|
||||
linkFont: font(15px);
|
||||
linkFontOver: font(15px underline);
|
||||
lineHeight: 24px;
|
||||
}
|
||||
}
|
||||
|
@ -53,8 +49,6 @@ introTitle: FlatLabel(defaultFlatLabel) {
|
|||
textFg: introTitleFg;
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
font: font(17px semibold);
|
||||
linkFont: font(17px semibold);
|
||||
linkFontOver: font(17px semibold underline);
|
||||
}
|
||||
}
|
||||
introTitleTop: 1px;
|
||||
|
@ -180,8 +174,6 @@ introQrTitle: FlatLabel(defaultFlatLabel) {
|
|||
minWidth: introQrTitleWidth;
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
font: font(20px semibold);
|
||||
linkFont: font(20px semibold);
|
||||
linkFontOver: font(20px semibold underline);
|
||||
}
|
||||
}
|
||||
introQrErrorTop: 336px;
|
||||
|
|
|
@ -354,8 +354,6 @@ QImage Sibling::nameImage(const SiblingLayout &layout) {
|
|||
_name.reset();
|
||||
_nameStyle = std::make_unique<style::TextStyle>(style::TextStyle{
|
||||
.font = font,
|
||||
.linkFont = font,
|
||||
.linkFontOver = font,
|
||||
});
|
||||
};
|
||||
const auto text = _peer->isSelf()
|
||||
|
|
|
@ -194,8 +194,6 @@ mediaviewSaveMsgShown: 2000;
|
|||
mediaviewSaveMsgHiding: 2500;
|
||||
mediaviewSaveMsgStyle: TextStyle(defaultTextStyle) {
|
||||
font: font(16px);
|
||||
linkFont: font(16px);
|
||||
linkFontOver: font(16px underline);
|
||||
}
|
||||
mediaviewTextPalette: TextPalette(defaultTextPalette) {
|
||||
linkFg: mediaviewTextLinkFg;
|
||||
|
@ -815,8 +813,6 @@ storiesUnsupportedLabel: FlatLabel(defaultFlatLabel) {
|
|||
textFg: mediaviewControlFg;
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
font: font(14px);
|
||||
linkFont: font(14px);
|
||||
linkFontOver: font(14px underline);
|
||||
lineHeight: 21px;
|
||||
}
|
||||
align: align(top);
|
||||
|
@ -1011,7 +1007,5 @@ storiesLikesEmptyRightSkip: 2px;
|
|||
|
||||
storiesLikeCountStyle: TextStyle(defaultTextStyle) {
|
||||
font: font(32px semibold);
|
||||
linkFont: font(32px semibold);
|
||||
linkFontOver: font(32px semibold underline);
|
||||
}
|
||||
storiesChangelogFooterWidthMin: 240px;
|
||||
|
|
|
@ -20,8 +20,6 @@ passportPasswordLabel: FlatLabel(boxLabel) {
|
|||
passportPasswordLabelBold: FlatLabel(passportPasswordLabel) {
|
||||
style: TextStyle(boxLabelStyle) {
|
||||
font: font(boxFontSize semibold);
|
||||
linkFont: font(boxFontSize semibold);
|
||||
linkFontOver: font(boxFontSize semibold underline);
|
||||
}
|
||||
}
|
||||
passportPasswordSetupLabel: FlatLabel(passportPasswordLabel) {
|
||||
|
@ -93,8 +91,7 @@ passportFormDividerHeight: 13px;
|
|||
passportFormLabelPadding: margins(22px, 7px, 22px, 14px);
|
||||
passportFormPolicy: FlatLabel(boxDividerLabel) {
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
linkFont: font(fsize semibold underline);
|
||||
linkFontOver: font(fsize semibold underline);
|
||||
linkUnderline: kLinkUnderlineAlways;
|
||||
}
|
||||
palette: TextPalette(defaultTextPalette) {
|
||||
linkFg: windowSubTextFg;
|
||||
|
|
|
@ -144,6 +144,14 @@ not_null<Ui::RpWidget*> PanelForm::setupContent() {
|
|||
});
|
||||
}, lifetime());
|
||||
const auto policyUrl = _controller->privacyPolicyUrl();
|
||||
auto policyLink = tr::lng_passport_policy(
|
||||
lt_bot,
|
||||
rpl::single(bot->name())
|
||||
) | Ui::Text::ToLink(
|
||||
policyUrl
|
||||
) | rpl::map([=](TextWithEntities &&text) {
|
||||
return Ui::Text::Wrapped(std::move(text), EntityType::Bold);
|
||||
});
|
||||
auto text = policyUrl.isEmpty()
|
||||
? tr::lng_passport_allow(
|
||||
lt_bot,
|
||||
|
@ -151,10 +159,7 @@ not_null<Ui::RpWidget*> PanelForm::setupContent() {
|
|||
) | Ui::Text::ToWithEntities()
|
||||
: tr::lng_passport_accept_allow(
|
||||
lt_policy,
|
||||
tr::lng_passport_policy(
|
||||
lt_bot,
|
||||
rpl::single(bot->name())
|
||||
) | Ui::Text::ToLink(policyUrl),
|
||||
std::move(policyLink),
|
||||
lt_bot,
|
||||
rpl::single('@' + bot->username()) | Ui::Text::ToWithEntities(),
|
||||
Ui::Text::WithEntities);
|
||||
|
|
|
@ -102,8 +102,6 @@ settingsStoriesIconLinks: icon {{ "menu/links_profile", premiumButtonBg1 }};
|
|||
settingsPremiumNewBadge: FlatLabel(defaultFlatLabel) {
|
||||
style: TextStyle(semiboldTextStyle) {
|
||||
font: font(10px semibold);
|
||||
linkFont: font(10px semibold);
|
||||
linkFontOver: font(10px semibold);
|
||||
}
|
||||
textFg: windowFgActive;
|
||||
}
|
||||
|
@ -133,8 +131,6 @@ settingsThumbSkip: 16px;
|
|||
settingsSubsectionTitle: FlatLabel(defaultFlatLabel) {
|
||||
style: TextStyle(semiboldTextStyle) {
|
||||
font: font(boxFontSize semibold);
|
||||
linkFont: font(boxFontSize semibold);
|
||||
linkFontOver: font(boxFontSize semibold underline);
|
||||
}
|
||||
textFg: windowActiveTextFg;
|
||||
minWidth: 240px;
|
||||
|
@ -215,8 +211,6 @@ settingsCoverName: FlatLabel(defaultFlatLabel) {
|
|||
maxHeight: 24px;
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
font: font(17px semibold);
|
||||
linkFont: font(17px semibold);
|
||||
linkFontOver: font(17px semibold);
|
||||
}
|
||||
}
|
||||
settingsCoverStatus: FlatLabel(defaultFlatLabel) {
|
||||
|
@ -305,8 +299,6 @@ settingsDeviceName: InputField(defaultInputField) {
|
|||
dictionariesSectionButton: SettingsButton(settingsUpdateToggle) {
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
font: font(14px semibold);
|
||||
linkFont: font(14px semibold);
|
||||
linkFontOver: font(14px semibold underline);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -349,8 +341,6 @@ sessionBigName: FlatLabel(defaultFlatLabel) {
|
|||
maxHeight: 29px;
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
font: font(20px semibold);
|
||||
linkFont: font(20px semibold);
|
||||
linkFontOver: font(20px semibold underline);
|
||||
}
|
||||
align: align(top);
|
||||
}
|
||||
|
@ -480,8 +470,7 @@ settingsPremiumPreviewIconPosition: point(20px, 7px);
|
|||
settingsPremiumTitlePadding: margins(0px, 18px, 0px, 11px);
|
||||
settingsPremiumAboutTextStyle: TextStyle(defaultTextStyle) {
|
||||
font: font(12px);
|
||||
linkFont: font(12px underline);
|
||||
linkFontOver: font(12px underline);
|
||||
linkUnderline: kLinkUnderlineAlways;
|
||||
lineHeight: 18px;
|
||||
}
|
||||
settingsPremiumAbout: FlatLabel(defaultFlatLabel) {
|
||||
|
@ -504,8 +493,6 @@ settingsPremiumUserTitlePadding: margins(0px, 16px, 0px, 6px);
|
|||
settingsPremiumUserTitle: FlatLabel(boxTitle) {
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
font: boxTitleFont;
|
||||
linkFont: boxTitleFont;
|
||||
linkFontOver: font(16px semibold underline);
|
||||
lineHeight: 14px;
|
||||
}
|
||||
minWidth: 300px;
|
||||
|
@ -566,13 +553,9 @@ filterInviteBox: Box(defaultBox) {
|
|||
}
|
||||
filterInviteButtonStyle: TextStyle(defaultTextStyle) {
|
||||
font: font(13px semibold);
|
||||
linkFont: font(13px underline);
|
||||
linkFontOver: font(13px underline);
|
||||
}
|
||||
filterInviteButtonBadgeStyle: TextStyle(defaultTextStyle) {
|
||||
font: font(12px semibold);
|
||||
linkFont: font(12px underline);
|
||||
linkFontOver: font(12px underline);
|
||||
}
|
||||
filterInviteButtonBadgePadding: margins(5px, 0px, 5px, 2px);
|
||||
filterInviteButtonBadgeSkip: 5px;
|
||||
|
@ -580,8 +563,6 @@ filterLinkDividerLabelPadding: margins(0px, 10px, 0px, 17px);
|
|||
filterLinkTitlePadding: margins(0px, 15px, 0px, 17px);
|
||||
filterLinkAboutTextStyle: TextStyle(defaultTextStyle) {
|
||||
font: font(12px);
|
||||
linkFont: font(12px underline);
|
||||
linkFontOver: font(12px underline);
|
||||
lineHeight: 17px;
|
||||
}
|
||||
filterLinkAbout: FlatLabel(defaultFlatLabel) {
|
||||
|
|
|
@ -326,8 +326,10 @@ style::TextStyle Preview::scaled(
|
|||
int lineHeight) const {
|
||||
return {
|
||||
.font = scaled(value.font, fontSize),
|
||||
.linkFont = scaled(value.linkFont, fontSize),
|
||||
.linkFontOver = scaled(value.linkFontOver, fontSize),
|
||||
.linkUnderline = value.linkUnderline,
|
||||
.blockPadding = scaled(value.blockPadding),
|
||||
.blockOutline = scaled(value.blockOutline),
|
||||
.preScrollable = value.preScrollable,
|
||||
.lineHeight = scaled(value.lineHeight),
|
||||
};
|
||||
}
|
||||
|
|
|
@ -55,8 +55,6 @@ serviceTextPalette: TextPalette(defaultTextPalette) {
|
|||
}
|
||||
serviceTextStyle: TextStyle(defaultTextStyle) {
|
||||
font: msgServiceFont;
|
||||
linkFont: msgServiceFont;
|
||||
linkFontOver: font(fsize semibold underline);
|
||||
}
|
||||
inTextPalette: TextPalette(defaultTextPalette) {
|
||||
linkFg: historyLinkInFg;
|
||||
|
@ -91,7 +89,7 @@ outTextPaletteSelected: TextPalette(outTextPalette) {
|
|||
spoilerFg: msgOutDateFgSelected;
|
||||
}
|
||||
fwdTextStyle: TextStyle(semiboldTextStyle) {
|
||||
linkFontOver: semiboldFont;
|
||||
linkUnderline: kLinkUnderlineNever;
|
||||
}
|
||||
inFwdTextPalette: TextPalette(defaultTextPalette) {
|
||||
linkFg: msgInServiceFg;
|
||||
|
@ -319,8 +317,6 @@ msgBotKbButton: BotKeyboardButton {
|
|||
botKbDuration: 200;
|
||||
botKbStyle: TextStyle(defaultTextStyle) {
|
||||
font: font(15px semibold);
|
||||
linkFont: font(15px semibold);
|
||||
linkFontOver: font(15px semibold);
|
||||
}
|
||||
botKbButton: BotKeyboardButton {
|
||||
margin: 10px;
|
||||
|
@ -553,8 +549,6 @@ webPagePhotoDelta: 8px;
|
|||
historyPollQuestionFont: semiboldFont;
|
||||
historyPollQuestionStyle: TextStyle(defaultTextStyle) {
|
||||
font: historyPollQuestionFont;
|
||||
linkFont: historyPollQuestionFont;
|
||||
linkFontOver: historyPollQuestionFont;
|
||||
}
|
||||
historyPollAnswerStyle: defaultTextStyle;
|
||||
historyPollQuestionTop: 7px;
|
||||
|
@ -741,8 +735,6 @@ whoLikedDateHeartOver: icon{{ "menu/read_react_s", windowSubTextFgOver }};
|
|||
whoReadDateChecksPosition: point(-7px, -4px);
|
||||
whoReadDateStyle: TextStyle(defaultTextStyle) {
|
||||
font: font(12px);
|
||||
linkFont: font(12px);
|
||||
linkFontOver: font(12px underline);
|
||||
}
|
||||
whoReadChecks: icon{{ "menu/read_ticks", windowBoldFg }};
|
||||
whoReadChecksOver: icon{{ "menu/read_ticks", windowBoldFg }};
|
||||
|
@ -860,8 +852,6 @@ historySponsorInfoItem: FlatLabel(defaultFlatLabel) {
|
|||
historyHasCustomEmoji: FlatLabel(defaultFlatLabel) {
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
font: font(11px);
|
||||
linkFont: font(11px underline);
|
||||
linkFontOver: font(11px underline);
|
||||
}
|
||||
minWidth: 80px;
|
||||
}
|
||||
|
|
|
@ -61,8 +61,6 @@ premiumPreviewAboutTitle: FlatLabel(defaultFlatLabel) {
|
|||
align: align(top);
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
font: font(17px semibold);
|
||||
linkFont: font(17px semibold);
|
||||
linkFontOver: font(17px semibold);
|
||||
}
|
||||
}
|
||||
premiumPreviewAbout: FlatLabel(defaultFlatLabel) {
|
||||
|
@ -184,8 +182,6 @@ premiumGiftTerms: FlatLabel(defaultFlatLabel) {
|
|||
textFg: windowSubTextFg;
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
font: font(11px);
|
||||
linkFont: font(11px);
|
||||
linkFontOver: font(11px underline);
|
||||
}
|
||||
}
|
||||
premiumGiftBox: Box(premiumPreviewBox) {
|
||||
|
@ -212,8 +208,6 @@ boostTitle: FlatLabel(defaultFlatLabel) {
|
|||
maxHeight: 24px;
|
||||
style: TextStyle(boxTextStyle) {
|
||||
font: font(17px semibold);
|
||||
linkFont: font(17px semibold);
|
||||
linkFontOver: font(17px semibold);
|
||||
}
|
||||
}
|
||||
boostTextSkip: 5px;
|
||||
|
|
|
@ -151,8 +151,6 @@ mainMenuTelegramLabel: FlatLabel(defaultFlatLabel) {
|
|||
textFg: windowSubTextFg;
|
||||
style: TextStyle(defaultTextStyle) {
|
||||
font: semiboldFont;
|
||||
linkFont: semiboldFont;
|
||||
linkFontOver: font(fsize semibold underline);
|
||||
}
|
||||
palette: TextPalette(defaultTextPalette) {
|
||||
linkFg: windowSubTextFg;
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit bc7b5bd4a23f57fd09ea573b20b4b63cd1fe0bf2
|
||||
Subproject commit 013e7e9c3ca475eaed9b3ec31df05e6e32434b18
|
|
@ -1 +1 @@
|
|||
Subproject commit 3698eb53827dc9929e583666a8e7f6462741d1a6
|
||||
Subproject commit 44f8d862ff03390217841fb282cb8dd55e0d5d7d
|
Loading…
Add table
Reference in a new issue