diff --git a/Telegram/Resources/icons/add_contact_phone.png b/Telegram/Resources/icons/add_contact_phone.png deleted file mode 100644 index f649ba2fd..000000000 Binary files a/Telegram/Resources/icons/add_contact_phone.png and /dev/null differ diff --git a/Telegram/Resources/icons/add_contact_phone@2x.png b/Telegram/Resources/icons/add_contact_phone@2x.png deleted file mode 100644 index b01522770..000000000 Binary files a/Telegram/Resources/icons/add_contact_phone@2x.png and /dev/null differ diff --git a/Telegram/Resources/icons/add_contact_user.png b/Telegram/Resources/icons/add_contact_user.png deleted file mode 100644 index 1d494cde8..000000000 Binary files a/Telegram/Resources/icons/add_contact_user.png and /dev/null differ diff --git a/Telegram/Resources/icons/add_contact_user@2x.png b/Telegram/Resources/icons/add_contact_user@2x.png deleted file mode 100644 index a45ef3073..000000000 Binary files a/Telegram/Resources/icons/add_contact_user@2x.png and /dev/null differ diff --git a/Telegram/SourceFiles/boxes/add_contact_box.cpp b/Telegram/SourceFiles/boxes/add_contact_box.cpp index bcbab78c5..d037eaf9d 100644 --- a/Telegram/SourceFiles/boxes/add_contact_box.cpp +++ b/Telegram/SourceFiles/boxes/add_contact_box.cpp @@ -149,8 +149,16 @@ void AddContactBox::paintEvent(QPaintEvent *e) { auto textHeight = height() - st::contactPadding.top() - st::contactPadding.bottom() - st::boxPadding.bottom(); p.drawText(QRect(st::boxPadding.left(), st::contactPadding.top(), width() - st::boxPadding.left() - st::boxPadding.right(), textHeight), lng_contact_not_joined(lt_name, _sentName), style::al_topleft); } else { - st::contactUserIcon.paint(p, st::boxPadding.left(), _first->y() + st::contactIconTop, width()); - st::contactPhoneIcon.paint(p, st::boxPadding.left(), _phone->y() + st::contactIconTop, width()); + st::contactUserIcon.paint( + p, + st::boxPadding.left() + st::contactIconPosition.x(), + _first->y() + st::contactIconPosition.y(), + width()); + st::contactPhoneIcon.paint( + p, + st::boxPadding.left() + st::contactIconPosition.x(), + _phone->y() + st::contactIconPosition.y(), + width()); } } diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style index 2b828fe5f..6d1e89279 100644 --- a/Telegram/SourceFiles/boxes/boxes.style +++ b/Telegram/SourceFiles/boxes/boxes.style @@ -199,9 +199,9 @@ editBioCountdownLabel: FlatLabel(defaultFlatLabel) { textFg: windowSubTextFg; } -contactUserIcon: icon {{ "add_contact_user", menuIconFg }}; -contactPhoneIcon: icon {{ "add_contact_phone", menuIconFg }}; -contactIconTop: 28px; +contactUserIcon: icon {{ "settings_name", menuIconFg }}; +contactPhoneIcon: icon {{ "settings_phone_number", menuIconFg }}; +contactIconPosition: point(-5px, 23px); contactsAddIconAbove: icon {{ "contacts_add", activeButtonFg, point(18px, 18px) }}; contactsAdd: TwoIconButton {