RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-03-11 08:48:14 +00:00
Code Issues Projects Releases Wiki Activity

Allowing to choose bots in appoint supergroup admin box.

Browse Source 
Better naturalHeight() for bot keyboards. We try to make all
the buttons in the row have equal size (size of the largest button).
This commit is contained in:
John Preston 2016-04-14 15:00:44 +03:00
parent 68a9a0a12e
commit 291f483671
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Telegram/SourceFiles/boxes/contactsbox.cpp
View File

@ -957,7 +957,6 @@ void ContactsInner::peopleReceived(const QString &query, const QVector<MTPPeer>
if (p->asUser()->botInfo->cantJoinGroups) continue;
}
if (_channel) {
if (_channel->isMegagroup() && _membersFilter == MembersFilterAdmins) continue;
if (!_channel->isMegagroup() && _membersFilter != MembersFilterAdmins) continue;
}
}

23
Telegram/SourceFiles/history.cpp
View File

@ -2626,10 +2626,10 @@ void ReplyKeyboard::resize(int width, int height) {
}
bool ReplyKeyboard::isEnoughSpace(int width, const style::botKeyboardButton &st) const {
for_const (const ButtonRow &row, _rows) {
for_const (const auto &row, _rows) {
int s = row.size();
int widthLeft = width - ((s - 1) * st.margin + s * 2 * st.padding);
for_const (const Button &button, row) {
for_const (const auto &button, row) {
widthLeft -= qMax(button.text.maxWidth(), 1);
if (widthLeft < 0) {
if (row.size() > 3) {
@ -2648,18 +2648,15 @@ void ReplyKeyboard::setStyle(StylePtr &&st) {
}
int ReplyKeyboard::naturalWidth() const {
int result = 0;
auto result = 0;
for_const (const auto &row, _rows) {
auto rowMaxButtonWidth = 0;
for_const (const auto &button, row) {
accumulate_max(rowMaxButtonWidth, qMax(button.text.maxWidth(), 1) + _st->minButtonWidth(button.type));
}
auto markup = _item->Get<HistoryMessageReplyMarkup>();
for_const (const ButtonRow &row, _rows) {
int rowSize = row.size();
int rowWidth = (rowSize - 1) * _st->buttonSkip();
for_const (const Button &button, row) {
rowWidth += qMax(button.text.maxWidth(), 1) + _st->minButtonWidth(button.type);
}
if (rowWidth > result) {
result = rowWidth;
}
auto rowSize = row.size();
accumulate_max(result, rowSize * rowMaxButtonWidth + (rowSize - 1) * _st->buttonSkip());
}
return result;
}