Support emoji in account names.
This commit is contained in:
parent
dc6080b57b
commit
667e2e697e
|
@ -891,7 +891,7 @@ pollResultsShowMore: SettingsButton(defaultSettingsButton) {
|
||||||
textBg: windowBg;
|
textBg: windowBg;
|
||||||
textBgOver: windowBgOver;
|
textBgOver: windowBgOver;
|
||||||
|
|
||||||
font: semiboldFont;
|
style: semiboldTextStyle;
|
||||||
|
|
||||||
height: 20px;
|
height: 20px;
|
||||||
padding: margins(71px, 10px, 8px, 8px);
|
padding: margins(71px, 10px, 8px, 8px);
|
||||||
|
@ -905,7 +905,11 @@ inviteViaLinkButton: SettingsButton(defaultSettingsButton) {
|
||||||
textBg: windowBg;
|
textBg: windowBg;
|
||||||
textBgOver: windowBgOver;
|
textBgOver: windowBgOver;
|
||||||
|
|
||||||
font: font(14px semibold);
|
style: TextStyle(defaultTextStyle) {
|
||||||
|
font: font(14px semibold);
|
||||||
|
linkFont: font(14px semibold);
|
||||||
|
linkFontOver: font(14px semibold underline);
|
||||||
|
}
|
||||||
|
|
||||||
height: 20px;
|
height: 20px;
|
||||||
padding: margins(74px, 8px, 8px, 9px);
|
padding: margins(74px, 8px, 8px, 9px);
|
||||||
|
|
|
@ -1694,8 +1694,8 @@ object_ptr<Ui::SettingsButton> EditPeerInfoBox::CreateButton(
|
||||||
) | rpl::map([&st](const QString &text, const QString &count, int width) {
|
) | rpl::map([&st](const QString &text, const QString &count, int width) {
|
||||||
const auto available = width
|
const auto available = width
|
||||||
- st.button.padding.left()
|
- st.button.padding.left()
|
||||||
- (st.button.font->spacew * 2)
|
- (st.button.style.font->spacew * 2)
|
||||||
- st.button.font->width(text)
|
- st.button.style.font->width(text)
|
||||||
- st.labelPosition.x();
|
- st.labelPosition.x();
|
||||||
const auto required = st.label.style.font->width(count);
|
const auto required = st.label.style.font->width(count);
|
||||||
return (required > available)
|
return (required > available)
|
||||||
|
|
|
@ -750,7 +750,7 @@ groupCallAddMember: SettingsButton(defaultSettingsButton) {
|
||||||
textBg: groupCallMembersBg;
|
textBg: groupCallMembersBg;
|
||||||
textBgOver: groupCallMembersBgOver;
|
textBgOver: groupCallMembersBgOver;
|
||||||
|
|
||||||
font: semiboldFont;
|
style: semiboldTextStyle;
|
||||||
|
|
||||||
height: 22px;
|
height: 22px;
|
||||||
padding: margins(63px, 17px, 22px, 11px);
|
padding: margins(63px, 17px, 22px, 11px);
|
||||||
|
|
|
@ -379,7 +379,7 @@ infoProfileToggleOver: Toggle(infoProfileToggle) {
|
||||||
untoggledFg: menuIconFgOver;
|
untoggledFg: menuIconFgOver;
|
||||||
}
|
}
|
||||||
infoProfileButton: SettingsButton(defaultSettingsButton) {
|
infoProfileButton: SettingsButton(defaultSettingsButton) {
|
||||||
font: normalFont;
|
style: defaultTextStyle;
|
||||||
|
|
||||||
padding: margins(79px, 10px, 8px, 8px);
|
padding: margins(79px, 10px, 8px, 8px);
|
||||||
iconLeft: 22px;
|
iconLeft: 22px;
|
||||||
|
@ -394,7 +394,7 @@ infoNotificationsButton: SettingsButton(infoProfileButton) {
|
||||||
infoMainButton: SettingsButton(infoProfileButton) {
|
infoMainButton: SettingsButton(infoProfileButton) {
|
||||||
textFg: lightButtonFg;
|
textFg: lightButtonFg;
|
||||||
textFgOver: lightButtonFgOver;
|
textFgOver: lightButtonFgOver;
|
||||||
font: semiboldFont;
|
style: semiboldTextStyle;
|
||||||
}
|
}
|
||||||
infoSharedMediaCoverHeight: 62px;
|
infoSharedMediaCoverHeight: 62px;
|
||||||
infoSharedMediaButton: infoProfileButton;
|
infoSharedMediaButton: infoProfileButton;
|
||||||
|
@ -843,7 +843,7 @@ inviteLinkCreate: SettingsButton(defaultSettingsButton) {
|
||||||
textBg: windowBg;
|
textBg: windowBg;
|
||||||
textBgOver: windowBgOver;
|
textBgOver: windowBgOver;
|
||||||
|
|
||||||
font: semiboldFont;
|
style: semiboldTextStyle;
|
||||||
|
|
||||||
height: 20px;
|
height: 20px;
|
||||||
padding: margins(60px, 7px, 12px, 5px);
|
padding: margins(60px, 7px, 12px, 5px);
|
||||||
|
|
|
@ -126,7 +126,7 @@ passportUploadButton: SettingsButton(defaultSettingsButton) {
|
||||||
textBg: windowBg;
|
textBg: windowBg;
|
||||||
textBgOver: windowBgOver;
|
textBgOver: windowBgOver;
|
||||||
|
|
||||||
font: semiboldFont;
|
style: semiboldTextStyle;
|
||||||
|
|
||||||
height: 18px;
|
height: 18px;
|
||||||
padding: margins(22px, 14px, 22px, 12px);
|
padding: margins(22px, 14px, 22px, 12px);
|
||||||
|
|
|
@ -11,7 +11,7 @@ using "info/info.style";
|
||||||
using "boxes/boxes.style";
|
using "boxes/boxes.style";
|
||||||
|
|
||||||
settingsButton: SettingsButton(infoProfileButton) {
|
settingsButton: SettingsButton(infoProfileButton) {
|
||||||
font: boxTextFont;
|
style: boxTextStyle;
|
||||||
padding: margins(60px, 10px, 22px, 10px);
|
padding: margins(60px, 10px, 22px, 10px);
|
||||||
iconLeft: 20px;
|
iconLeft: 20px;
|
||||||
}
|
}
|
||||||
|
@ -267,7 +267,11 @@ settingsDeviceName: InputField(defaultInputField) {
|
||||||
}
|
}
|
||||||
|
|
||||||
dictionariesSectionButton: SettingsButton(settingsUpdateToggle) {
|
dictionariesSectionButton: SettingsButton(settingsUpdateToggle) {
|
||||||
font: font(14px semibold);
|
style: TextStyle(defaultTextStyle) {
|
||||||
|
font: font(14px semibold);
|
||||||
|
linkFont: font(14px semibold);
|
||||||
|
linkFontOver: font(14px semibold underline);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
sessionsScroll: boxScroll;
|
sessionsScroll: boxScroll;
|
||||||
|
|
|
@ -216,7 +216,7 @@ void CreateRightLabel(
|
||||||
const auto available = width
|
const auto available = width
|
||||||
- st.padding.left()
|
- st.padding.left()
|
||||||
- st.padding.right()
|
- st.padding.right()
|
||||||
- st.font->width(button)
|
- st.style.font->width(button)
|
||||||
- st::settingsButtonRightSkip;
|
- st::settingsButtonRightSkip;
|
||||||
name->setText(text);
|
name->setText(text);
|
||||||
name->resizeToNaturalWidth(available);
|
name->resizeToNaturalWidth(available);
|
||||||
|
|
|
@ -133,7 +133,7 @@ mainMenu: Menu(defaultMenu) {
|
||||||
itemToggleShift: 11px;
|
itemToggleShift: 11px;
|
||||||
}
|
}
|
||||||
mainMenuButton: SettingsButton(defaultSettingsButton) {
|
mainMenuButton: SettingsButton(defaultSettingsButton) {
|
||||||
font: semiboldFont;
|
style: semiboldTextStyle;
|
||||||
padding: margins(61px, 11px, 20px, 9px);
|
padding: margins(61px, 11px, 20px, 9px);
|
||||||
toggleSkip: 19px;
|
toggleSkip: 19px;
|
||||||
iconLeft: 21px;
|
iconLeft: 21px;
|
||||||
|
@ -230,7 +230,7 @@ createThemeImportButton: SettingsButton(defaultSettingsButton) {
|
||||||
textBg: windowBg;
|
textBg: windowBg;
|
||||||
textBgOver: windowBgOver;
|
textBgOver: windowBgOver;
|
||||||
|
|
||||||
font: semiboldFont;
|
style: semiboldTextStyle;
|
||||||
|
|
||||||
height: 20px;
|
height: 20px;
|
||||||
padding: margins(22px, 10px, 22px, 8px);
|
padding: margins(22px, 10px, 22px, 8px);
|
||||||
|
|
|
@ -197,8 +197,9 @@ void AddUnreadBadge(
|
||||||
padding.right(),
|
padding.right(),
|
||||||
(outer.height() - inner.height()) / 2,
|
(outer.height() - inner.height()) / 2,
|
||||||
outer.width());
|
outer.width());
|
||||||
padding.setRight(
|
padding.setRight(padding.right()
|
||||||
padding.right() + inner.width() + button->st().font->spacew);
|
+ inner.width()
|
||||||
|
+ button->st().style.font->spacew);
|
||||||
}
|
}
|
||||||
button->setPaddingOverride(padding);
|
button->setPaddingOverride(padding);
|
||||||
}, state->widget.lifetime());
|
}, state->widget.lifetime());
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 1ba9270234db8cbe8badbe6f6fbaea0a5869e28d
|
Subproject commit 8415f7058c83178d19150a76a7a865a3d1da5916
|
Loading…
Reference in New Issue