From 423356d42c683c1144455fcac5b320312922e38e Mon Sep 17 00:00:00 2001 From: RadRussianRus Date: Sat, 19 Oct 2019 03:14:33 +0300 Subject: [PATCH] Slight redesign of hidden profile number --- Telegram/SourceFiles/window/window.style | 5 +++++ Telegram/SourceFiles/window/window_main_menu.cpp | 12 ++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Telegram/SourceFiles/window/window.style b/Telegram/SourceFiles/window/window.style index 719ba2130..47fc3afde 100644 --- a/Telegram/SourceFiles/window/window.style +++ b/Telegram/SourceFiles/window/window.style @@ -113,6 +113,11 @@ mainMenuResetScaleIconLeft: 5px; mainMenuCoverTextLeft: 30px; mainMenuCoverNameTop: 84px; mainMenuCoverStatusTop: 102px; +mainMenuCoverNameOnlyTop: 94px; +mainMenuCoverNameOnlyFont: font(14px semibold); +mainMenuCoverNameOnlyStyle: TextStyle(semiboldTextStyle) { + font: mainMenuCoverNameOnlyFont; +} mainMenuSkip: 13px; mainMenu: Menu(defaultMenu) { itemFg: windowBoldFg; diff --git a/Telegram/SourceFiles/window/window_main_menu.cpp b/Telegram/SourceFiles/window/window_main_menu.cpp index 319d020d4..248152736 100644 --- a/Telegram/SourceFiles/window/window_main_menu.cpp +++ b/Telegram/SourceFiles/window/window_main_menu.cpp @@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/widgets/menu.h" #include "ui/widgets/popup_menu.h" #include "ui/text/text_utilities.h" +#include "ui/text_options.h" #include "ui/special_buttons.h" #include "ui/empty_userpic.h" #include "mainwindow.h" @@ -418,8 +419,8 @@ void MainMenu::paintEvent(QPaintEvent *e) { p.fillRect(cover, st::mainMenuCoverBg); } p.setPen(st::mainMenuCoverFg); - p.setFont(st::semiboldFont); if (cShowPhoneInDrawer()) { + p.setFont(st::semiboldFont); _controller->session().user()->nameText().drawLeftElided( p, st::mainMenuCoverTextLeft, @@ -429,11 +430,14 @@ void MainMenu::paintEvent(QPaintEvent *e) { p.setFont(st::normalFont); p.drawTextLeft(st::mainMenuCoverTextLeft, st::mainMenuCoverStatusTop, width(), _phoneText); } else { - const auto diff = st::mainMenuCoverStatusTop - st::mainMenuCoverNameTop; - _controller->session().user()->nameText().drawLeftElided( + p.setFont(st::mainMenuCoverNameOnlyFont); + auto name = _controller->session().user()->nameText().toString(); + auto nameStr = Ui::Text::String(); + nameStr.setText(st::mainMenuCoverNameOnlyStyle, name, Ui::NameTextOptions()); + nameStr.drawLeftElided( p, st::mainMenuCoverTextLeft, - st::mainMenuCoverNameTop + (diff / 2), + st::mainMenuCoverNameOnlyTop, widthText, width());