hiro/tdesktop
1
0
Fork 0
mirror of https://github.com/vale981/tdesktop synced 2025-03-06 18:21:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed online color in contacts box, fixed share contact with text, fixed choose in contacts box by Enter key

Browse source
This commit is contained in:
John Preston 2015-12-06 20:30:50 +03:00
parent 485a6b551f
commit edf850be55
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Telegram/SourceFiles/boxes/contactsbox.cpp
View file

@ -1382,6 +1382,7 @@ void ContactsBox::init() {
connect(&_scroll, SIGNAL(scrolled()), &_inner, SLOT(updateSel()));
connect(&_scroll, SIGNAL(scrolled()), this, SLOT(onScroll()));
connect(&_filter, SIGNAL(changed()), this, SLOT(onFilterUpdate()));
connect(&_filter, SIGNAL(submitted(bool)), this, SLOT(onSubmit()));
connect(&_filterCancel, SIGNAL(clicked()), this, SLOT(onFilterCancel()));
connect(&_inner, SIGNAL(mustScrollTo(int, int)), &_scroll, SLOT(scrollToY(int, int)));
connect(&_inner, SIGNAL(selectAllQuery()), &_filter, SLOT(selectAll()));
@ -1503,14 +1504,12 @@ void ContactsBox::showDone() {
_filter.setFocus();
}
void ContactsBox::onSubmit() {
_inner.chooseParticipant();
}
void ContactsBox::keyPressEvent(QKeyEvent *e) {
if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) {
if (_filter.hasFocus()) {
_inner.chooseParticipant();
} else {
ItemListBox::keyPressEvent(e);
}
} else if (_filter.hasFocus()) {
if (_filter.hasFocus()) {
if (e->key() == Qt::Key_Down) {
_inner.selectSkip(1);
} else if (e->key() == Qt::Key_Up) {
@ -1919,7 +1918,7 @@ void MembersInner::paintDialog(Painter &p, PeerData *peer, MemberData *data, boo
}
p.setFont(st::contactsStatusFont->f);
p.setPen(sel ? st::contactsStatusFgOver : (data->onlineColor ? st::contactsStatusFgOnline : st::contactsStatusFg));
p.setPen(data->onlineColor ? st::contactsStatusFgOnline : (sel ? st::contactsStatusFgOver : st::contactsStatusFg));
p.drawTextLeft(namex, st::contactsPadding.top() + st::contactsStatusTop, width(), data->online);
}

2
Telegram/SourceFiles/boxes/contactsbox.h
View file

@ -216,6 +216,8 @@ public slots:
void onCreate();
void onSaveAdmins();
void onSubmit();
bool onSearchByUsername(bool searchCache = false);
void onNeedSearchByUsername();

3
Telegram/SourceFiles/historywidget.cpp
View file

@ -5297,11 +5297,12 @@ void HistoryWidget::cancelSendFile(const FileLoadResultPtr &file) {
void HistoryWidget::confirmShareContact(const QString &phone, const QString &fname, const QString &lname, MsgId replyTo, bool ctrlShiftEnter) {
if (!_peer) return;
PeerId shareToId = _peer->id;
if (_confirmWithTextId == 0xFFFFFFFFFFFFFFFFL) {
onSend(ctrlShiftEnter, replyTo);
_confirmWithTextId = 0;
}
shareContact(_peer->id, phone, fname, lname, replyTo);
shareContact(shareToId, phone, fname, lname, replyTo);
}
void HistoryWidget::cancelShareContact() {