From f283aa033bf965e0abf54b20d72c36b127784e4f Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Wed, 19 Jul 2017 22:20:38 +0300
Subject: [PATCH] Fix a couple of layout bugs for username edit.
---
Telegram/SourceFiles/boxes/boxes.style | 3 ++-
Telegram/SourceFiles/settings/settings_info_widget.cpp | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style
index cd7ddc1d59..193561e50e 100644
--- a/Telegram/SourceFiles/boxes/boxes.style
+++ b/Telegram/SourceFiles/boxes/boxes.style
@@ -567,7 +567,8 @@ passcodeTextStyle: TextStyle(defaultTextStyle) {
usernamePadding: margins(23px, 6px, 21px, 12px);
usernameSkip: 49px;
-usernameTextStyle: boxTextStyle;
+usernameTextStyle: TextStyle(boxTextStyle, passcodeTextStyle) {
+}
usernameDefaultFg: windowSubTextFg;
downloadPathSkip: 10px;
diff --git a/Telegram/SourceFiles/settings/settings_info_widget.cpp b/Telegram/SourceFiles/settings/settings_info_widget.cpp
index 488d56fc98..dd2b05467a 100644
--- a/Telegram/SourceFiles/settings/settings_info_widget.cpp
+++ b/Telegram/SourceFiles/settings/settings_info_widget.cpp
@@ -44,8 +44,8 @@ InfoWidget::InfoWidget(QWidget *parent, UserData *self) : BlockWidget(parent, se
}
void InfoWidget::createControls() {
- style::margins margin(0, -st::settingsBlockOneLineTextPart.margin.top(), 0, st::settingsSmallSkip - st::settingsBlockOneLineTextPart.margin.bottom());
- style::margins slidedPadding(0, st::settingsSmallSkip / 2, 0, st::settingsSmallSkip - (st::settingsSmallSkip / 2));
+ style::margins margin(0, 0, 0, 0);
+ style::margins slidedPadding(0, 0, 0, 0);
addChildRow(_mobileNumber, margin, slidedPadding, st::settingsBlockOneLineTextPart);
addChildRow(_username, margin, slidedPadding, st::settingsBlockOneLineTextPart);
addChildRow(_link, margin, slidedPadding, st::settingsBlockOneLineTextPart);