procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

added padding in player, bot commands description QString -> Text (emoji support)

This commit is contained in:
John Preston 2015-07-03 18:55:22 +03:00
parent e509c14ed1
commit 4f2ff9e343
13 changed files with 140 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Telegram/Resources/style.txt
View File

@ -1999,3 +1999,4 @@ playerUnavailableOpacity: 0.3;
playerDuration: 200;
playlistHoverBg: #f2f2f2;
playlistPadding: 10px;

42
Telegram/SourceFiles/dropdown.cpp
View File

@ -2532,8 +2532,8 @@ void MentionsInner::paintEvent(QPaintEvent *e) {
} else {
UserData *user = _crows->at(i).first;
const BotCommand &command = _crows->at(i).second;
QString toHighlight = command.command;
const BotCommand *command = _crows->at(i).second;
QString toHighlight = command->command;
int32 botStatus = _parent->chat() ? _parent->chat()->botStatus : -1;
if (hasUsername || botStatus == 0 || botStatus == 2) {
toHighlight += '@' + user->username;
@ -2565,17 +2565,9 @@ void MentionsInner::paintEvent(QPaintEvent *e) {
}
addleft += firstwidth + secondwidth + st::mentionPadding.left();
widthleft -= firstwidth + secondwidth + st::mentionPadding.left();
QString description = command.description;
if (widthleft > st::mentionFont->elidew && !description.isEmpty()) {
p.setFont(st::mentionFont->f);
int32 descwidth = st::mentionFont->m.width(description);
if (widthleft < descwidth) {
description = st::mentionFont->m.elidedText(description, Qt::ElideRight, widthleft);
descwidth = st::mentionFont->m.width(description);
}
if (widthleft > st::mentionFont->elidew && !command->descriptionText().isEmpty()) {
p.setPen((selected ? st::mentionFgOver : st::mentionFg)->p);
p.drawText(mentionleft + addleft + (widthleft - descwidth), i * st::mentionHeight + st::mentionTop + st::mentionFont->ascent, description);
command->descriptionText().drawElided(p, mentionleft + addleft, i * st::mentionHeight + st::mentionTop, widthleft, 1, style::al_right);
}
}
}
@ -2629,12 +2621,12 @@ QString MentionsInner::getSelected() const {
result = '#' + _hrows->at(_sel);
} else {
UserData *user = _crows->at(_sel).first;
const BotCommand &command(_crows->at(_sel).second);
const BotCommand *command(_crows->at(_sel).second);
int32 botStatus = _parent->chat() ? _parent->chat()->botStatus : -1;
if (botStatus == 0 || botStatus == 2 || _parent->filter().indexOf('@') > 1) {
result = '/' + command.command + '@' + user->username;
result = '/' + command->command + '@' + user->username;
} else {
result = '/' + command.command;
result = '/' + command->command;
}
}
return result;
@ -2765,6 +2757,12 @@ void MentionsDropdown::showFiltered(PeerData *peer, QString start) {
updateFiltered(toDown);
}
bool MentionsDropdown::clearFilteredCommands() {
if (_crows.isEmpty()) return false;
_crows.clear();
return true;
}
void MentionsDropdown::updateFiltered(bool toDown) {
int32 now = unixtime();
MentionRows rows;
@ -2846,9 +2844,9 @@ void MentionsDropdown::updateFiltered(bool toDown) {
for (int32 j = 0, l = user->botInfo->commands.size(); j < l; ++j) {
if (_filter.size() > 1) {
QString toFilter = (hasUsername || botStatus == 0 || botStatus == 2) ? user->botInfo->commands.at(j).command + '@' + user->username : user->botInfo->commands.at(j).command;
if (!toFilter.startsWith(_filter.midRef(1), Qt::CaseInsensitive) || toFilter.size() + 1 == _filter.size()) continue;
if (!toFilter.startsWith(_filter.midRef(1), Qt::CaseInsensitive)/* || toFilter.size() + 1 == _filter.size()*/) continue;
}
crows.push_back(qMakePair(user, user->botInfo->commands.at(j)));
crows.push_back(qMakePair(user, &user->botInfo->commands.at(j)));
}
}
}
@ -2858,9 +2856,9 @@ void MentionsDropdown::updateFiltered(bool toDown) {
for (int32 j = 0, l = user->botInfo->commands.size(); j < l; ++j) {
if (_filter.size() > 1) {
QString toFilter = (hasUsername || botStatus == 0 || botStatus == 2) ? user->botInfo->commands.at(j).command + '@' + user->username : user->botInfo->commands.at(j).command;
if (!toFilter.startsWith(_filter.midRef(1), Qt::CaseInsensitive) || toFilter.size() + 1 == _filter.size()) continue;
if (!toFilter.startsWith(_filter.midRef(1), Qt::CaseInsensitive)/* || toFilter.size() + 1 == _filter.size()*/) continue;
}
crows.push_back(qMakePair(user, user->botInfo->commands.at(j)));
crows.push_back(qMakePair(user, &user->botInfo->commands.at(j)));
}
}
}
@ -2869,10 +2867,10 @@ void MentionsDropdown::updateFiltered(bool toDown) {
if (rows.isEmpty() && hrows.isEmpty() && crows.isEmpty()) {
if (!isHidden()) {
hideStart();
_rows.clear();
_hrows.clear();
_crows.clear();
}
_rows.clear();
_hrows.clear();
_crows.clear();
} else {
_rows = rows;
_hrows = hrows;

3
Telegram/SourceFiles/dropdown.h
View File

@ -481,7 +481,7 @@ private:
typedef QList<UserData*> MentionRows;
typedef QList<QString> HashtagRows;
typedef QList<QPair<UserData*, BotCommand> > BotCommandRows;
typedef QList<QPair<UserData*, const BotCommand*> > BotCommandRows;
class MentionsDropdown;
class MentionsInner : public QWidget {
@ -541,6 +541,7 @@ public:
void fastHide();
bool clearFilteredCommands();
void showFiltered(PeerData *peer, QString start);
void updateFiltered(bool toDown = false);
void setBoundings(QRect boundings);

16
Telegram/SourceFiles/gui/text.cpp
View File

@ -1614,6 +1614,14 @@ public:
}
}
style::font applyFlags(int32 flags, const style::font &f) {
style::font result = f;
if (flags & TextBlockBold) result = result->bold();
if (flags & TextBlockItalic) result = result->italic();
if (flags & TextBlockUnderline) result = result->underline();
return result;
}
void eSetFont(ITextBlock *block) {
style::font newFont = _t->_font;
int flags = block->flags();
@ -1628,13 +1636,11 @@ public:
} else {
newFont = _textStyle->lnkFlags;
}
} else {
flags = block->flags();
if (flags & TextBlockBold) newFont = newFont->bold();
if (flags & TextBlockItalic) newFont = newFont->italic();
if (flags & TextBlockUnderline) newFont = newFont->underline();
}
if (newFont != _f) {
if (newFont->family() == _t->_font->family()) {
newFont = applyFlags(flags | newFont->flags(), _t->_font);
}
_f = newFont;
_e->fnt = _f->f;
_e->resetFontEngineCache();

1
Telegram/SourceFiles/history.h
View File

@ -929,6 +929,7 @@ private:
};
QString formatSizeText(qint64 size);
QString formatDownloadText(qint64 ready, qint64 total);
QString formatDurationText(qint64 duration);
class HistoryVideo : public HistoryMedia {

10
Telegram/SourceFiles/historywidget.cpp
View File

@ -2475,6 +2475,14 @@ void HistoryWidget::updateStickers() {
_stickersUpdateRequest = MTP::send(MTPmessages_GetAllStickers(MTP_string(cStickersHash())), rpcDone(&HistoryWidget::stickersGot), rpcFail(&HistoryWidget::stickersFailed));
}
void HistoryWidget::botCommandsChanged(UserData *user) {
if (histPeer && (histPeer == user || histPeer->chat)) {
if (_attachMention.clearFilteredCommands()) {
checkMentionDropdown();
}
}
}
void HistoryWidget::stickersGot(const MTPmessages_AllStickers &stickers) {
cSetLastStickersUpdate(getms(true));
_stickersUpdateRequest = 0;
@ -3946,7 +3954,7 @@ void HistoryWidget::onKbToggle(bool manual) {
_field.setMaxHeight(st::maxFieldHeight);
_kbReplyTo = hist->peer->chat ? App::histItemById(_keyboard.forMsgId()) : 0;
_kbReplyTo = App::histItemById(_keyboard.forMsgId());
if (_kbReplyTo && !_replyToId) {
updateReplyToName();
_replyToText.setText(st::msgFont, _kbReplyTo->inDialogsText(), _textDlgOptions);

1
Telegram/SourceFiles/historywidget.h
View File

@ -555,6 +555,7 @@ public slots:
void onDraftSave(bool delayed = false);
void updateStickers();
void botCommandsChanged(UserData *user);
void onRecordError();
void onRecordDone(QByteArray result, qint32 samples);

4
Telegram/SourceFiles/mainwidget.cpp
View File

@ -578,6 +578,10 @@ void MainWidget::updateStickers() {
history.updateStickers();
}
void MainWidget::botCommandsChanged(UserData *bot) {
history.botCommandsChanged(bot);
}
void MainWidget::onUpdateMuted() {
App::updateMuted();
}

1
Telegram/SourceFiles/mainwidget.h
View File

@ -367,6 +367,7 @@ public:
void updateMutedIn(int32 seconds);
void updateStickers();
void botCommandsChanged(UserData *bot);
~MainWidget();

29
Telegram/SourceFiles/overviewwidget.cpp
View File

@ -878,7 +878,7 @@ void OverviewInner::onUpdateSelected() {
TextLinkPtr lnk;
HistoryItem *item = 0;
int32 index = -1;
_selectedMsgId = 0;
int32 newsel = 0;
if (_type == OverviewPhotos) {
float64 w = (float64(_width - st::overviewPhotoSkip) / _photosInRow);
int32 inRow = int32((m.x() - (st::overviewPhotoSkip / 2)) / w), vsize = (_vsize + st::overviewPhotoSkip);
@ -919,14 +919,12 @@ void OverviewInner::onUpdateSelected() {
if (!count) return;
bool upon = true;
if (i < 0) {
if (m.y() < _addToY) {
i = 0;
_selectedMsgId = -1;
upon = false;
}
if (i >= count) {
i = count - 1;
_selectedMsgId = -1;
upon = false;
}
MsgId msgid = _hist->_overview[_type][i];
@ -938,10 +936,19 @@ void OverviewInner::onUpdateSelected() {
HistoryMedia *media = item->getMedia(true);
if (media && media->type() == MediaTypeDocument) {
lnk = static_cast<HistoryDocument*>(media)->linkInPlaylist();
if (_selectedMsgId >= 0) _selectedMsgId = item->id;
newsel = item->id;
}
}
if (newsel != _selectedMsgId) {
updateMsg(App::histItemById(_selectedMsgId));
_selectedMsgId = newsel;
updateMsg(item);
}
} else {
if (newsel != _selectedMsgId) {
updateMsg(App::histItemById(_selectedMsgId));
_selectedMsgId = newsel;
}
return;
}
} else {
@ -1184,8 +1191,8 @@ void OverviewInner::enterEvent(QEvent *e) {
void OverviewInner::leaveEvent(QEvent *e) {
if (_selectedMsgId > 0) {
_selectedMsgId = 0;
updateMsg(App::histItemById(_selectedMsgId));
_selectedMsgId = 0;
}
if (textlnkOver()) {
updateMsg(App::hoveredLinkItem());
@ -1306,7 +1313,7 @@ void OverviewInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
int32 OverviewInner::resizeToWidth(int32 nwidth, int32 scrollTop, int32 minHeight) {
if (width() == nwidth && minHeight == _minHeight) return scrollTop;
_minHeight = minHeight;
_addToY = (_type != OverviewAudioDocuments && _height < _minHeight) ? (_minHeight - _height) : 0;
_addToY = (_type == OverviewAudioDocuments) ? st::playlistPadding : ((_height < _minHeight) ? (_minHeight - _height) : 0);
if (_type == OverviewPhotos && _resizeIndex < 0) {
_resizeIndex = _photosInRow * ((scrollTop + minHeight) / int32(_vsize + st::overviewPhotoSkip)) + _photosInRow - 1;
_resizeSkip = (scrollTop + minHeight) - ((scrollTop + minHeight) / int32(_vsize + st::overviewPhotoSkip)) * int32(_vsize + st::overviewPhotoSkip);
@ -1591,7 +1598,7 @@ void OverviewInner::mediaOverviewUpdated(bool fromResize) {
if (_height != y) {
_height = y;
if (!fromResize) {
_addToY = (_type != OverviewAudioDocuments && _height < _minHeight) ? (_minHeight - _height) : 0;
_addToY = (_type == OverviewAudioDocuments) ? st::playlistPadding : ((_height < _minHeight) ? (_minHeight - _height) : 0);
resize(width(), _minHeight > _height ? _minHeight : _height);
}
}
@ -1676,7 +1683,7 @@ void OverviewInner::itemResized(HistoryItem *item, bool scrollToIt) {
_items[j].y += newh;
}
_height = _items[l - 1].y;
_addToY = (_type != OverviewAudioDocuments && _height < _minHeight) ? (_minHeight - _height) : 0;
_addToY = (_type == OverviewAudioDocuments) ? st::playlistPadding : ((_height < _minHeight) ? (_minHeight - _height) : 0);
resize(width(), _minHeight > _height ? _minHeight : _height);
if (scrollToIt) {
if (_addToY + _height - from > _scroll->scrollTop() + _scroll->height()) {
@ -1741,14 +1748,14 @@ void OverviewInner::showAll(bool recountHeights) {
newHeight = _height = (_vsize + st::overviewPhotoSkip) * rows + st::overviewPhotoSkip;
} else if (_type == OverviewAudioDocuments) {
int32 count = _hist->_overview[_type].size(), fullCount = _hist->_overviewCount[_type];
newHeight = _height = count * _audioHeight;
newHeight = _height = count * _audioHeight + 2 * st::playlistPadding;
} else {
if (recountHeights && _type == OverviewVideos) { // recount heights because of captions
mediaOverviewUpdated(true);
}
newHeight = _height;
}
_addToY = (_type != OverviewAudioDocuments && _height < _minHeight) ? (_minHeight - _height) : 0;
_addToY = (_type == OverviewAudioDocuments) ? st::playlistPadding : ((_height < _minHeight) ? (_minHeight - _height) : 0);
if (newHeight < _minHeight) {
newHeight = _minHeight;
}

17
Telegram/SourceFiles/playerwidget.cpp
View File

@ -494,15 +494,24 @@ void PlayerWidget::updateState(SongMsgId playing, AudioPlayerState playingState,
} else if (_song) {
display = _song.song->song()->duration;
}
QString time = (_down == OverPlayback) ? _time : formatDurationText(display);
bool showPause = false, stopped = ((playingState & AudioPlayerStoppedMask) || playingState == AudioPlayerFinishing);
bool wasPlaying = !!_duration;
if (!stopped) {
showPause = (playingState == AudioPlayerPlaying || playingState == AudioPlayerResuming || playingState == AudioPlayerStarting);
}
float64 progress = duration ? snap(float64(position) / duration, 0., 1.) : 0.;
int32 loaded = duration ? _song.song->size : (_song.song->loader ? _song.song->loader->currentOffset() : 0);
float64 loadProgress = (duration || !_song.song->loader) ? 1. : snap(float64(loaded) / qMax(_song.song->size, 1), 0., 1.);
QString time;
float64 progress = 0.;
int32 loaded;
float64 loadProgress = 1.;
if (duration || !_song.song->loader) {
time = (_down == OverPlayback) ? _time : formatDurationText(display);
progress = duration ? snap(float64(position) / duration, 0., 1.) : 0.;
loaded = duration ? _song.song->size : 0;
} else {
loaded = _song.song->loader ? _song.song->loader->currentOffset() : 0;
time = formatDownloadText(loaded, _song.song->size);
loadProgress = snap(float64(loaded) / qMax(_song.song->size, 1), 0., 1.);
}
if (time != _time || showPause != _showPause) {
if (_time != time) {
_time = time;

36
Telegram/SourceFiles/structs.cpp
View File

@ -216,7 +216,10 @@ void UserData::setBotInfoVersion(int32 version) {
botInfo = new BotInfo();
botInfo->version = version;
} else if (botInfo->version < version) {
botInfo->commands.clear();
if (!botInfo->commands.isEmpty()) {
botInfo->commands.clear();
if (App::main()) App::main()->botCommandsChanged(this);
}
botInfo->description.clear();
botInfo->shareText.clear();
botInfo->version = version;
@ -226,6 +229,9 @@ void UserData::setBotInfoVersion(int32 version) {
void UserData::setBotInfo(const MTPBotInfo &info) {
switch (info.type()) {
case mtpc_botInfoEmpty:
if (botInfo && !botInfo->commands.isEmpty()) {
if (App::main()) App::main()->botCommandsChanged(this);
}
delete botInfo;
botInfo = 0;
break;
@ -247,15 +253,37 @@ void UserData::setBotInfo(const MTPBotInfo &info) {
botInfo->shareText = qs(d.vshare_text);
const QVector<MTPBotCommand> &v(d.vcommands.c_vector().v);
botInfo->commands.clear();
botInfo->commands.reserve(v.size());
bool changedCommands = false;
int32 j = 0;
for (int32 i = 0, l = v.size(); i < l; ++i) {
if (v.at(i).type() == mtpc_botCommand) {
botInfo->commands.push_back(BotCommand(qs(v.at(i).c_botCommand().vcommand), qs(v.at(i).c_botCommand().vdescription)));
if (v.at(i).type() != mtpc_botCommand) continue;
QString cmd = qs(v.at(i).c_botCommand().vcommand), desc = qs(v.at(i).c_botCommand().vdescription);
if (botInfo->commands.size() <= j) {
botInfo->commands.push_back(BotCommand(cmd, desc));
changedCommands = true;
} else {
if (botInfo->commands[j].command != cmd) {
botInfo->commands[j].command = cmd;
changedCommands = true;
}
if (botInfo->commands[j].setDescription(desc)) {
changedCommands = true;
}
}
++j;
}
while (j < botInfo->commands.size()) {
botInfo->commands.pop_back();
changedCommands = true;
}
botInfo->inited = true;
if (changedCommands && App::main()) {
App::main()->botCommandsChanged(this);
}
} break;
}
}

30
Telegram/SourceFiles/structs.h
View File

@ -120,11 +120,35 @@ private:
PeerData *_peer;
};
struct BotCommand {
BotCommand(const QString &command, const QString &description) : command(command), description(description) {
class BotCommand {
public:
BotCommand(const QString &command, const QString &description) : command(command), _description(description) {
}
QString command, description;
QString command;
bool setDescription(const QString &description) {
if (_description != description) {
_description = description;
_descriptionText = Text();
return true;
}
return false;
}
const Text &descriptionText() const {
if (_descriptionText.isEmpty() && !_description.isEmpty()) {
_descriptionText.setText(st::mentionFont, _description, _textNameOptions);
}
return _descriptionText;
}
private:
QString _description;
mutable Text _descriptionText;
};
struct BotInfo {
BotInfo() : inited(false), readsAllHistory(false), cantJoinGroups(false), version(0), text(st::msgMinWidth) {
}