2
0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-09-05 09:05:14 +00:00

conflicts fixed

This commit is contained in:
John Preston
2015-10-23 18:18:43 +02:00
18 changed files with 439 additions and 28 deletions

View File

@@ -1218,7 +1218,7 @@ void ProfileInner::contextMenuEvent(QContextMenuEvent *e) {
if (!_phoneText.isEmpty() || (_peerUser && !_peerUser->username.isEmpty())) {
QRect info(_left + st::profilePhotoSize + st::profilePhoneLeft, st::profilePadding.top(), _width - st::profilePhotoSize - st::profilePhoneLeft, st::profilePhotoSize);
if (info.contains(mapFromGlobal(e->globalPos()))) {
_menu = new ContextMenu(this);
_menu = new PopupMenu();
if (!_phoneText.isEmpty()) {
_menu->addAction(lang(lng_profile_copy_phone), this, SLOT(onCopyPhone()))->setEnabled(true);
}